diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang.meta new file mode 100644 index 0000000000..74246ec81c --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b36fa02db761b8c4ba00fee3df351fdc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_banner.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_banner.png new file mode 100644 index 0000000000..ee096d76cf Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_banner.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_banner.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_banner.png.meta new file mode 100644 index 0000000000..2837e1084d --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_banner.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 3cf7b7848367eca4ba5bd960e1f82c06 +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: a48316a8bb7094d48ac099f2d5eeabf4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_bicon1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_bicon1.png new file mode 100644 index 0000000000..82c7ab7ea6 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_bicon1.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_bicon1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_bicon1.png.meta new file mode 100644 index 0000000000..9ced291fba --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_bicon1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: b98630c8e06d2e24e8e2bd66ada35e05 +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: 1aa44b1c736c1424abbd66d76c364c69 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_bicon2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_bicon2.png new file mode 100644 index 0000000000..677137acef Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_bicon2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_bicon2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_bicon2.png.meta new file mode 100644 index 0000000000..5972242997 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_bicon2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: b3de3d1a1da97da42a6c723c5fee6302 +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: 8af795ab2a471a846a221e40bc5c10e9 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang1.png new file mode 100644 index 0000000000..3b7a8c7390 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang1.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang1.png.meta new file mode 100644 index 0000000000..77d0581c8a --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: cbe0822c9ef29a1439d5826a5a6d9d07 +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: 9d5aea2dd39f1dc4799b7e56c0579166 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang2.png new file mode 100644 index 0000000000..794e27cc16 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang2.png.meta new file mode 100644 index 0000000000..1feb0e5845 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: cdcb19a6c04d0584182e9653e08b86f2 +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: 61bad507b4a60c543a8d141889088b3d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang3.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang3.png new file mode 100644 index 0000000000..be59d1e1ce Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang3.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang3.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang3.png.meta new file mode 100644 index 0000000000..9a67bd6ec6 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang3.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: a6adf8ee050956942af910c6b8b40970 +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: 5c50cf539f3ade34a917323b954be80e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_zi.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_zi.png new file mode 100644 index 0000000000..b9cc63c630 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_zi.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_zi.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_zi.png.meta new file mode 100644 index 0000000000..63736229f1 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_zi.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: b921f230978705f41831d4bef504690f +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: 21e444c5c578a4f4087d56995a526c5b + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang.png new file mode 100644 index 0000000000..7dcaaef15c Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang.png.meta new file mode 100644 index 0000000000..72a1218b07 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 00ba43e5ce675364f97561017bd0085a +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: 5a7cf9a658e4e314ab9a11d448c668b9 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index 0c36c68458..8ceab59d10 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -3877,6 +3877,7 @@ RectTransform: - {fileID: 1745033544839090825} - {fileID: 5368326415734529191} - {fileID: 101555534899689678} + - {fileID: 2583685898697459694} - {fileID: 2583667563870890104} - {fileID: 1338579734977636462} - {fileID: 9081327288207073813} @@ -18699,7 +18700,7 @@ RectTransform: m_Children: - {fileID: 5655445736015705706} m_Father: {fileID: 8609906984241842863} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -22465,7 +22466,7 @@ RectTransform: - {fileID: 1008042109767524304} - {fileID: 2991313753996687485} m_Father: {fileID: 8609906984241842863} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -24618,7 +24619,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8609906984241842863} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -31580,6 +31581,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5504369026569062367 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2583685898697459694} + - component: {fileID: 2029826224036587863} + - component: {fileID: 4943888142735647832} + m_Layer: 5 + m_Name: bg5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2583685898697459694 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5504369026569062367} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8609906984241842863} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -326} + m_SizeDelta: {x: 1080, y: 472} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2029826224036587863 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5504369026569062367} + m_CullTransparentMesh: 0 +--- !u!114 &4943888142735647832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5504369026569062367} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 3cf7b7848367eca4ba5bd960e1f82c06, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &5509575088230043484 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index faa5b41d0f..21dcd1ac61 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -23,27 +23,31 @@ local tabs = { default = "d_danxinbixue_icon2", lock = "d_danxinbixue_icon2", select = "d_danxinbixue_bicon1", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [5] = { --限时召唤 + [5] = { --势不可挡 + default = "d_danxinbixue_icon2", lock = "d_danxinbixue_icon2", select = "d_danxinbixue_bicon1", + rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + }, + [11] = { --限时召唤 default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01", rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,ActType = ActivityTypeDef.FindFairy }, - [6] = { --乾坤宝盒 + [12] = { --乾坤宝盒 default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01", rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,ActType = ActivityTypeDef.QianKunBox }, - [7] = { --珍奇礼包 + [13] = { --珍奇礼包 default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01", rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_Treasure }, - [8] = { --累计充值 + [14] = { --累计充值 default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu", rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_recharge }, - [9] = { --限时商市 + [15] = { --限时商市 default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01", rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_TimeLimitShop }, - [10] = { --限时兑换 + [16] = { --限时兑换 default = "r_xianshiduihuan_anniu_01", lock = "r_xianshiduihuan_anniu_01", select = "r_xianshiduihuan_anniu", rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.LimitExchange }, @@ -53,12 +57,13 @@ local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表 [2] = 1, [3] = 1, [4] = 1, - [5] = 2, - [6] = 3, - [7] = 4, - [8] = 5, - [9] = 6, - [10] = 7, + [5] = 1, + [11] = 2, + [12] = 3, + [13] = 4, + [14] = 5, + [15] = 6, + [16] = 7, } local TimeLimitedCall = require("Modules/DynamicActivity/TimeLimitedCall") diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index 0baaad1ef8..ce5a374100 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -10,6 +10,7 @@ local bannerType = { [2] = "bg2", [3] = "bg3", [4] = "bg4", + [5] = "bg5", } 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 d46cc0728a..b94ca9cb45 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -23,9 +23,9 @@ local activityType = { [4301] = { bg = "Bg1", hero = { - [1]={name="Bg1/hero1",id=10001,hero="x_xianshizaohuan_fx"}, - [2]={name="Bg1/hero3",id=10041,hero="x_xianshizaohuan_ttjz"}, - [3]={name="Bg1/hero2",id=10089,hero="x_xianshizaohuan_rd"}, + [1]={name="Bg1/hero1",id=10001,hero="x_xianshizaohuan_fx"}, --伏羲 + [2]={name="Bg1/hero3",id=10041,hero="x_xianshizaohuan_ttjz"}, --通天教主 + [3]={name="Bg1/hero2",id=10089,hero="x_xianshizaohuan_rd"}, --燃灯 }, title = "x_xianshizaohuan_solgan", helptype = HELP_TYPE.TimeLimitedCall @@ -34,9 +34,9 @@ local activityType = { [4302] = { bg = "Bg2", hero = { - [1]={name="Bg2/hero1",id=10009,hero="c_ygsj_kuang02"}, - [2]={name="Bg2/hero3",id=10026,hero="c_ygsj_kuang03"}, - [3]={name="Bg2/hero2",id=10040,hero="c_ygsj_kuang01"}, + [1]={name="Bg2/hero1",id=10009,hero="c_ygsj_kuang02"}, --龙吉公主 + [2]={name="Bg2/hero3",id=10026,hero="c_ygsj_kuang03"}, --东华帝君 + [3]={name="Bg2/hero2",id=10040,hero="c_ygsj_kuang01"}, --杨戬 }, title = "c_ydsj_slogan", helptype = HELP_TYPE.TimeLimitedCall @@ -45,9 +45,9 @@ local activityType = { [4303] = { bg = "Bg2", hero = { - [1]={name="Bg2/hero1",id=10006,hero="c_ccfy_kuang02"}, - [2]={name="Bg2/hero3",id=10023,hero="c_ccfy_kuang03"}, - [3]={name="Bg2/hero2",id=10014,hero="c_ccfy_kuang01"}, + [1]={name="Bg2/hero1",id=10006,hero="c_ccfy_kuang02"}, --共工 + [2]={name="Bg2/hero3",id=10023,hero="c_ccfy_kuang03"}, --孙悟空 + [3]={name="Bg2/hero2",id=10014,hero="c_ccfy_kuang01"}, --哪吒 }, title = "c_ccfy_slogan", helptype = HELP_TYPE.TimeLimitedCall @@ -56,13 +56,24 @@ local activityType = { [4304] = { bg = "Bg2", hero = { - [1]={name="Bg2/hero1",id=10003,hero="d_danxinbixue_shenjiang1"}, - [2]={name="Bg2/hero3",id=10024,hero="d_danxinbixue_shenjiang3"}, - [3]={name="Bg2/hero2",id=10089,hero="d_danxinbixue_shenjiang2"}, + [1]={name="Bg2/hero1",id=10003,hero="d_danxinbixue_shenjiang1"}, --猪八戒 + [2]={name="Bg2/hero3",id=10024,hero="d_danxinbixue_shenjiang3"}, --姜子牙 + [3]={name="Bg2/hero2",id=10089,hero="d_danxinbixue_shenjiang2"}, ----燃灯 }, title = "d_danxinbixue_zi", helptype = HELP_TYPE.TimeLimitedCall }, + --势不可挡 限时召唤 + [4304] = { + bg = "Bg2", + hero = { + [1]={name="Bg2/hero1",id=10014,hero="s_shibukedang_shenjiang1"}, ----哪吒 + [2]={name="Bg2/hero3",id=10090,hero="s_shibukedang_shenjiang3"}, --阎罗王 + [3]={name="Bg2/hero2",id=10009,hero="s_shibukedang_shenjiang2"}, ----龙吉公主 + }, + title = "s_shibukedang_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 495487ac3c..07f7994265 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -54,6 +54,7 @@ local mainDynamicActivityIcon = { [2] = "r_zjm_huodongicon-yongguansanjun", -- 勇冠三军 [3] = "r_zjm_huodongicon-chichafenyun", --叱咤风云 [4] = "r_zjm_huodongicon-danxinbixue", --碧血丹心 + [5] = "r_zjm_huodongicon-shibukedang", ----势不可挡 } function this:AddFuncItem(btnGO, pos) return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}