diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe.meta new file mode 100644 index 0000000000..be6e8d1940 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75f0896dfe499584aaa90c5dc54ee6d6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_banner.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_banner.png new file mode 100644 index 0000000000..5b0c42d677 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_banner.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_banner.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_banner.png.meta new file mode 100644 index 0000000000..be263656fb --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_banner.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 2266b375f9ba5b6478d2a130fcbe7862 +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: 5dc1cc376d852424c886f8dd4a333922 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_icon1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_icon1.png new file mode 100644 index 0000000000..78afe0ee3e Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_icon1.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_icon1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_icon1.png.meta new file mode 100644 index 0000000000..9aadb50e26 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_icon1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 142694a6719f50b49baac9ad39266f44 +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: 319370967263cbf48b4f58f7e67c653d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_icon2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_icon2.png new file mode 100644 index 0000000000..3e24d5d49b Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_icon2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_icon2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_icon2.png.meta new file mode 100644 index 0000000000..2d1e710a88 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_icon2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 8fd621a391b55f841a7fd8ad9bfa3485 +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: 339c9fdd7b34b27459043810a2289642 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_shenjiang1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_shenjiang1.png new file mode 100644 index 0000000000..7e10c33ff8 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_shenjiang1.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_shenjiang1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_shenjiang1.png.meta new file mode 100644 index 0000000000..181884bbb8 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_shenjiang1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 194a93040e35baa46afdf9efb04e3e1c +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: 8968ff90aa411be41b2185ec0f29894c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_shenjiang2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_shenjiang2.png new file mode 100644 index 0000000000..8e48f73a99 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_shenjiang2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_shenjiang2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_shenjiang2.png.meta new file mode 100644 index 0000000000..00e20583be --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_shenjiang2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: bf64080607b483c418caadf61c70f25a +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: 68b63077808e5524b81a3aa2c8f34a22 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_zi.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_zi.png new file mode 100644 index 0000000000..2cc070c12e Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_zi.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_zi.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_zi.png.meta new file mode 100644 index 0000000000..aa9741c4df --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe/b_bianhuanmoce_zi.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 11ec26b6373ea654095267c08faf82f5 +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: aabfea84ce8a7e24c8a9e9e53d6cbfae + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce.png new file mode 100644 index 0000000000..716610b547 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce.png.meta new file mode 100644 index 0000000000..e599dfadf6 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e0509c0b09ec7134c9f2ed3d3c34f604 +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: a479e8d9110c8b64088fc73d2fe3aff9 + 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 79562df159..9d434cd7f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -51,8 +51,8 @@ local tabs = { default = "q_qikaidesheng_icon2", lock = "q_qikaidesheng_icon2", select = "q_qikaidesheng_icon1", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [12] = { --第十三周 降龙伏虎 - default = "x_xianglongfuhu_icon2", lock = "x_xianglongfuhu_icon2", select = "x_xianglongfuhu_icon1", + [12] = { --第十三周 变幻莫测 + default = "b_bianhuanmoce_icon2", lock = "b_bianhuanmoce_icon2", select = "b_bianhuanmoce_icon1", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, [13] = { --第十四周 降龙伏虎 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index 97a95091af..0b42303dd3 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -17,6 +17,7 @@ local bannerType = { [9] = {compent = "bg1",titilebg1 = "x_xuanjimiaosuan_banner"}, [10] = {compent = "bg1",titilebg1 = "x_xianglongfuhu_banner"}, [11] = {compent = "bg1",titilebg1 = "q_qikaidesheng_banner"}, + [12] = {compent = "bg1",titilebg1 = "b_bianhuanmoce_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 83d2ca8dbc..d0e6144f56 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -129,7 +129,7 @@ local activityType = { title = "x_xianglongfuhu_zi", helptype = HELP_TYPE.TimeLimitedCall }, - --降龙伏虎 限时召唤 + --旗开得胜 限时召唤 [4311] = { bg = "Bg2", hero = { @@ -140,6 +140,17 @@ local activityType = { title = "q_qikaidesheng_zi", helptype = HELP_TYPE.TimeLimitedCall }, + --变幻莫测 限时召唤 + [4312] = { + bg = "Bg2", + hero = { + [1]={name="Bg2/hero1",id=10033,hero="b_bianhuanmoce_shenjiang1"}, ----净光天女 + [2]={name="Bg2/hero2",id=10002,hero="b_bianhuanmoce_shenjiang2"}, ---洛神 + [3]={name="Bg2/hero3",id=10015,hero="x_xianglongfuhu_shenjiang2"}, --伏虎罗汉 + }, + title = "b_bianhuanmoce_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 1ee1122333..e8d06be31d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -61,6 +61,7 @@ local mainDynamicActivityIcon = { [9] = "r_zjm_huodongicon-xuanjimiaosuan", ----玄机妙算 [10] = "r_zjm_huodongicon-xianglongfuhu", ----降龙伏虎 [11] = "r_zjm_huodongicon-qikaidesheng", ----旗开得胜 + [12] = "r_zjm_huodongicon-bianhuanmoce", ----变幻莫测 } function this:AddFuncItem(btnGO, pos) return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}