diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_dazi.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_dazi.png deleted file mode 100644 index cd608c594b..0000000000 Binary files a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_dazi.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_dazi1_zh.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_dazi1_zh.png new file mode 100644 index 0000000000..5c58102f63 Binary files /dev/null and b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_dazi1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_jueji 1.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_dazi1_zh.png.meta similarity index 95% rename from Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_jueji 1.png.meta rename to Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_dazi1_zh.png.meta index d1aa1bc748..acba267ec7 100644 --- a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_jueji 1.png.meta +++ b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_dazi1_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4d36c605c1021d64cb9821bc78a96970 +guid: 1e4fb278d7d1be943b33e8750becc36f TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: e8b68eec95bc7744d959ac85712fa43d + spriteID: 91bd12ed7e6dd0f49be94edf05f09f56 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_fabao 1.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_fabao 1.png deleted file mode 100644 index 1ab1e49654..0000000000 Binary files a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_fabao 1.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_fabao_zh.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_fabao_zh.png new file mode 100644 index 0000000000..b0300ff5e7 Binary files /dev/null and b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_fabao_zh.png differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_dazi.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_fabao_zh.png.meta similarity index 95% rename from Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_dazi.png.meta rename to Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_fabao_zh.png.meta index 11ee3eaae3..941168581d 100644 --- a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_dazi.png.meta +++ b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_fabao_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8f2c2f288e7bcd24b8ae39b45fd98c2b +guid: 9c8d9a236f4a1b4438f615fb45d43ca4 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 3d7d8a5e90a0c334b9f23c9894727a6d + spriteID: 1e69aafae1501cf41988fb78327ce059 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_jueji 1.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_jueji 1.png deleted file mode 100644 index d71cbf5f97..0000000000 Binary files a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_jueji 1.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_jueji_zh.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_jueji_zh.png new file mode 100644 index 0000000000..8f82423774 Binary files /dev/null and b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_jueji_zh.png differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_01.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_jueji_zh.png.meta similarity index 95% rename from Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_01.png.meta rename to Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_jueji_zh.png.meta index 407f4417d6..936329a2cf 100644 --- a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_01.png.meta +++ b/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_jueji_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fb382e743c35bcb45bc3503d0a8d2ce7 +guid: 76407bf72a1afa847aa19dc324c00c92 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 8d29a4ced6df83148a2f2e445b7b4941 + spriteID: 98ab1b7ce549a3a4ea3a13c42aa2cfbb vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dazi1_guang_zh.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dazi1_guang_zh.png new file mode 100644 index 0000000000..07a1c6fdfb Binary files /dev/null and b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dazi1_guang_zh.png differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_fabao 1.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dazi1_guang_zh.png.meta similarity index 95% rename from Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_fabao 1.png.meta rename to Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dazi1_guang_zh.png.meta index 7d81fb0f31..e2606df68f 100644 --- a/Assets/ManagedResources/Atlas/BattleBossAtlas/ArtFont/s_shoulinglaixi_fabao 1.png.meta +++ b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dazi1_guang_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0e5fdf5f5fe6b7343870a0aa675797c8 +guid: c0f9935736a5cea40a4c0d29865490a9 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: fb79c29f44725264e85c6d52491ec694 + spriteID: 1fde1127a19897f43ac55e1e443cffa3 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_01.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_01.png deleted file mode 100644 index 685d4a8202..0000000000 Binary files a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_01.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_02.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_02.png deleted file mode 100644 index 6165713b34..0000000000 Binary files a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_02.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_02.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_02.png.meta deleted file mode 100644 index c6cc9cd3b4..0000000000 --- a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_02.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 584321b939ae0ad4782440e0be45e81b -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: 06c14c46085d7e446b006392ac7b5dc6 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: BattleBossAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_03.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_03.png deleted file mode 100644 index 325652da2d..0000000000 Binary files a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_03.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_03.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_03.png.meta deleted file mode 100644 index 3c56d34185..0000000000 --- a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dibian_03.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 953cbf5254661d342bd034a1107795f1 -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: 2b4b3f205ad61794aa85e216b870f960 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: BattleBossAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dihei.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dihei.png deleted file mode 100644 index f778c56d57..0000000000 Binary files a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dihei.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dihei.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dihei.png.meta deleted file mode 100644 index a604833a8e..0000000000 --- a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dihei.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: cdbe0c200c327b94e91f2ea612db4818 -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: 7b6f5e873b1b43741b72375d2f96246e - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: BattleBossAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dikuang_zh.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dikuang_zh.png new file mode 100644 index 0000000000..e6a2254389 Binary files /dev/null and b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dikuang_zh.png differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dikuang_zh.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dikuang_zh.png.meta new file mode 100644 index 0000000000..e398bd6739 --- /dev/null +++ b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_dikuang_zh.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: af216256a5a7a7b40983d4530f0a40c9 +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: cd50e0af06ee1b942b5846a4c9abee83 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: BattleBossAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_hongguang_zh.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_hongguang_zh.png new file mode 100644 index 0000000000..c20b4c63e9 Binary files /dev/null and b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_hongguang_zh.png differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_hongguang_zh.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_hongguang_zh.png.meta new file mode 100644 index 0000000000..70f570a1cf --- /dev/null +++ b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_hongguang_zh.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 3eaac5ac6e50d6a4da38d63eee3ac3bc +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: ed473d1a5fd8f3c4a9b659208947a533 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: BattleBossAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_mingzidi.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_mingzidi.png.meta index 9a6cff143a..81f08aea2e 100644 --- a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_mingzidi.png.meta +++ b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_mingzidi.png.meta @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: c85884dd5e3cc8b47af431707deb7414 + spriteID: f4f4578c0846cd746afc84ff63668b6e vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_renshangxiadi.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_renshangxiadi.png deleted file mode 100644 index f6223df342..0000000000 Binary files a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_renshangxiadi.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_renshangxiadi.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_renshangxiadi.png.meta deleted file mode 100644 index ec7b2aea01..0000000000 --- a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_renshangxiadi.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: b5736840814064b4296b88bc3640d51a -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: e5e72c867e98ede4b871ea4d15187deb - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: BattleBossAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_yuan_zh.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_yuan_zh.png new file mode 100644 index 0000000000..282d6698a6 Binary files /dev/null and b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_yuan_zh.png differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_yuan_zh.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_yuan_zh.png.meta new file mode 100644 index 0000000000..3ff81893a9 --- /dev/null +++ b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_yuan_zh.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: c0c0fdb7708d818499549ab168426a61 +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: 8f0bef0b04c719f4cb161405e9b5dc57 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: BattleBossAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_yueliang.png b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_yueliang.png deleted file mode 100644 index ca9f0bb1aa..0000000000 Binary files a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_yueliang.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_yueliang.png.meta b/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_yueliang.png.meta deleted file mode 100644 index d66bac150b..0000000000 --- a/Assets/ManagedResources/Atlas/BattleBossAtlas/s_shoulinglaixi_yueliang.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 743c7f673e18ee543994c2bfcb2ec3f4 -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: 5167356379db59241a1c88030d74dca0 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: BattleBossAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab index 5571d01db2..506a8b035c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab @@ -1,5 +1,101 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &54559219953640609 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4959079471006372005} + - component: {fileID: 2603498373566626291} + - component: {fileID: 4953279530563544119} + - component: {fileID: 8005819079201308343} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4959079471006372005 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 54559219953640609} + 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: 7018861341754585205} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -338} + m_SizeDelta: {x: 800, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2603498373566626291 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 54559219953640609} + m_CullTransparentMesh: 0 +--- !u!114 &4953279530563544119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 54559219953640609} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u589E\u4F24 \u8FFD\u51FB \u589E\u4F24 \u8FFD\u51FB" + LanguageIndex: 0 +--- !u!114 &8005819079201308343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 54559219953640609} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 1, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &649293686949060231 GameObject: m_ObjectHideFlags: 0 @@ -4698,7 +4794,7 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &780578069007853825 +--- !u!1 &681583730752946749 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4706,78 +4802,72 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7710493809709237710} - - component: {fileID: 4123895217609152158} - - component: {fileID: 184626451639727725} + - component: {fileID: 7834052161774514506} + - component: {fileID: 2081487000556282413} + - component: {fileID: 3851389698927639619} m_Layer: 0 - m_Name: Text + m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7710493809709237710 +--- !u!224 &7834052161774514506 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 780578069007853825} - m_LocalRotation: {x: 0, y: 0, z: 0.026176924, w: 0.99965733} + m_GameObject: {fileID: 681583730752946749} + 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: 4854579191885003419} + m_Father: {fileID: 4524076657167416168} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 66, y: 2} - m_SizeDelta: {x: 660, y: 100} + m_AnchoredPosition: {x: -301.3, y: 95.2} + m_SizeDelta: {x: 226, y: 130} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4123895217609152158 +--- !u!222 &2081487000556282413 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 780578069007853825} + m_GameObject: {fileID: 681583730752946749} m_CullTransparentMesh: 0 ---- !u!114 &184626451639727725 +--- !u!114 &3851389698927639619 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 780578069007853825} + m_GameObject: {fileID: 681583730752946749} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9294118, g: 0.82745105, b: 0.53333336, a: 1} + 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_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 300 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u7EDD\u6280\u5BF9\u8840\u91CF\u6700\u597D\u963F\u5FB7\u654C\u4EBA\u5355\u4F4D\u9020\u6210\u4F24\u5230\u540E\u671F\u5509\u54E6\u8FD8\u662F\u6709\u8BB0\u5F55\u9644\u52A0\u7729\u6655\u6548\u679C" - LanguageIndex: 0 + m_Sprite: {fileID: 21300000, guid: 76407bf72a1afa847aa19dc324c00c92, 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 &844451488649820735 GameObject: m_ObjectHideFlags: 0 @@ -4938,7 +5028,7 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u707C\u70E7\u961F\u8F85\u52A9" LanguageIndex: 10916 ---- !u!1 &2360247049329805410 +--- !u!1 &1957709283481906277 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4946,50 +5036,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3972396737988767571} - - component: {fileID: 8112975363714492147} - - component: {fileID: 5795382363451928548} - m_Layer: 5 - m_Name: Image + - component: {fileID: 1214804237868224621} + - component: {fileID: 6872201676686473161} + - component: {fileID: 9041064491287192250} + m_Layer: 0 + m_Name: Image (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3972396737988767571 +--- !u!224 &1214804237868224621 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2360247049329805410} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1957709283481906277} + 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: 3127385651928122403} - m_RootOrder: 4 + m_Father: {fileID: 8881225554939750768} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 254, y: 667} - m_SizeDelta: {x: 463, y: 271} + m_AnchoredPosition: {x: 31.2, y: -34.2} + m_SizeDelta: {x: 848, y: 92} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8112975363714492147 +--- !u!222 &6872201676686473161 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2360247049329805410} + m_GameObject: {fileID: 1957709283481906277} m_CullTransparentMesh: 0 ---- !u!114 &5795382363451928548 +--- !u!114 &9041064491287192250 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2360247049329805410} + m_GameObject: {fileID: 1957709283481906277} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -5003,7 +5093,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8f2c2f288e7bcd24b8ae39b45fd98c2b, type: 3} + m_Sprite: {fileID: 21300000, guid: af216256a5a7a7b40983d4530f0a40c9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5117,10 +5207,10 @@ RectTransform: m_Father: {fileID: 6932820901339804976} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6915233853259937941 CanvasRenderer: @@ -5150,7 +5240,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: cdbe0c200c327b94e91f2ea612db4818, type: 3} + m_Sprite: {fileID: 21300000, guid: c0f9935736a5cea40a4c0d29865490a9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5268,8 +5358,9 @@ RectTransform: m_Children: - {fileID: 3727075743794394878} - {fileID: 1627151663862131466} + - {fileID: 4959079471006372005} m_Father: {fileID: 3127385651928122403} - m_RootOrder: 5 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5308,10 +5399,10 @@ RectTransform: m_Father: {fileID: 3127385651928122403} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 348, y: -482} - m_SizeDelta: {x: 762, y: 1018} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3516771177220664454 CanvasRenderer: @@ -5341,7 +5432,229 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: fb382e743c35bcb45bc3503d0a8d2ce7, type: 3} + m_Sprite: {fileID: 21300000, guid: 3eaac5ac6e50d6a4da38d63eee3ac3bc, 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 &3498697521810194728 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4300789958323628149} + - component: {fileID: 7590556891947278149} + - component: {fileID: 1714585163429481811} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4300789958323628149 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3498697521810194728} + 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: 1296008646247205113} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7590556891947278149 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3498697521810194728} + m_CullTransparentMesh: 0 +--- !u!114 &1714585163429481811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3498697521810194728} + 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: 0.49019608} + 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: cea0898d4352b7a47b6b7c95ec6e3883, 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 &3585625686088528177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 28987881940645046} + - component: {fileID: 1235850719052754818} + - component: {fileID: 6286747609983104177} + m_Layer: 0 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &28987881940645046 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3585625686088528177} + 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: 4524076657167416168} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 31.2, y: -10.1} + m_SizeDelta: {x: 848, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1235850719052754818 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3585625686088528177} + m_CullTransparentMesh: 0 +--- !u!114 &6286747609983104177 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3585625686088528177} + 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: af216256a5a7a7b40983d4530f0a40c9, 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 &4089553649860914917 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7968883748533857044} + - component: {fileID: 8058269594946079001} + - component: {fileID: 5772219712554478818} + m_Layer: 5 + m_Name: Image1 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7968883748533857044 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4089553649860914917} + 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: 3127385651928122403} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -8.5, y: -173.3} + m_SizeDelta: {x: 816, y: 330} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8058269594946079001 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4089553649860914917} + m_CullTransparentMesh: 0 +--- !u!114 &5772219712554478818 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4089553649860914917} + 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: 1e4fb278d7d1be943b33e8750becc36f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5458,154 +5771,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &4815268675403776897 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7801686457873853722} - - component: {fileID: 5344237426429331280} - - component: {fileID: 1182418424585131872} - m_Layer: 5 - m_Name: Image3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7801686457873853722 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4815268675403776897} - 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: 3127385651928122403} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -290, y: 0} - m_SizeDelta: {x: 616, y: 1970} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5344237426429331280 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4815268675403776897} - m_CullTransparentMesh: 0 ---- !u!114 &1182418424585131872 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4815268675403776897} - 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: 584321b939ae0ad4782440e0be45e81b, 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 &4876845500180076422 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1789802076394905324} - - component: {fileID: 5049272237732052794} - - component: {fileID: 3856762556495687806} - m_Layer: 5 - m_Name: Image (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1789802076394905324 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4876845500180076422} - 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: 3127385651928122403} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -303, y: -303} - m_SizeDelta: {x: 606, y: 606} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5049272237732052794 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4876845500180076422} - m_CullTransparentMesh: 0 ---- !u!114 &3856762556495687806 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4876845500180076422} - 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: 743c7f673e18ee543994c2bfcb2ec3f4, 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 &4881689462025194830 GameObject: m_ObjectHideFlags: 0 @@ -5831,6 +5996,7 @@ RectTransform: - {fileID: 7266648091790681345} - {fileID: 5781867560655199275} - {fileID: 3578655693771015575} + - {fileID: 4300789958323628149} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10603,14 +10769,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4524076657167416168} - - {fileID: 4854579191885003419} + - {fileID: 8881225554939750768} m_Father: {fileID: 7018861341754585205} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 142, y: -639} - m_SizeDelta: {x: 800, y: 270} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -658} + m_SizeDelta: {x: 0, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5915449550727104951 GameObject: @@ -10715,10 +10881,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2384690408042202180} - - {fileID: 2156302590570236374} - - {fileID: 7801686457873853722} - - {fileID: 1789802076394905324} - - {fileID: 3972396737988767571} + - {fileID: 7968883748533857044} - {fileID: 7018861341754585205} m_Father: {fileID: 1296008646247205113} m_RootOrder: 2 @@ -10863,7 +11026,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -427, y: 499} + m_AnchoredPosition: {x: -330, y: 592} m_SizeDelta: {x: 76, y: 317} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4744829592780842963 @@ -15858,80 +16021,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &7042943883684193608 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2156302590570236374} - - component: {fileID: 2161744510232478272} - - component: {fileID: 4851518095450456197} - m_Layer: 5 - m_Name: Image2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2156302590570236374 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7042943883684193608} - 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: 3127385651928122403} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 356, y: 938} - m_SizeDelta: {x: 762, y: 1920} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2161744510232478272 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7042943883684193608} - m_CullTransparentMesh: 0 ---- !u!114 &4851518095450456197 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7042943883684193608} - 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: 953cbf5254661d342bd034a1107795f1, 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 &7103598865690306290 GameObject: m_ObjectHideFlags: 0 @@ -15957,17 +16046,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7103598865690306290} - m_LocalRotation: {x: 0, y: 0, z: 0.026176924, w: 0.99965733} + 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: 4524076657167416168} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 52, y: 1} - m_SizeDelta: {x: 649.4, y: 100} + m_AnchoredPosition: {x: 31.500011, y: -10.1} + m_SizeDelta: {x: 847.4, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7589619026191443108 CanvasRenderer: @@ -15990,7 +16079,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.92941177, g: 0.827451, b: 0.53333336, a: 1} + m_Color: {r: 0.9333334, g: 0.8941177, b: 0.76470596, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -16012,81 +16101,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7EDD\u6280\u5BF9\u8840\u91CF\u6700\u597D\u963F\u5FB7\u654C\u4EBA\u5355\u4F4D\u9020\u6210\u4F24\u5230\u540E\u671F\u5509\u54E6\u8FD8\u662F\u6709\u8BB0\u5F55\u9644\u52A0\u7729\u6655\u6548\u679C" LanguageIndex: 0 ---- !u!1 &7404524988092607110 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4854579191885003419} - - component: {fileID: 2142231506101953119} - - component: {fileID: 6900015661809300718} - m_Layer: 0 - m_Name: talisman - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4854579191885003419 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7404524988092607110} - 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: - - {fileID: 7710493809709237710} - m_Father: {fileID: 1627151663862131466} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -57} - m_SizeDelta: {x: 767, y: 168} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2142231506101953119 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7404524988092607110} - m_CullTransparentMesh: 0 ---- !u!114 &6900015661809300718 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7404524988092607110} - 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: 0e5fdf5f5fe6b7343870a0aa675797c8, 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 &7415321434945440479 GameObject: m_ObjectHideFlags: 0 @@ -25585,7 +25599,6 @@ GameObject: m_Component: - component: {fileID: 4524076657167416168} - component: {fileID: 2083374691996212742} - - component: {fileID: 8769783043410669971} m_Layer: 0 m_Name: skill m_TagString: Untagged @@ -25604,14 +25617,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7834052161774514506} + - {fileID: 28987881940645046} - {fileID: 8432455912276369123} m_Father: {fileID: 1627151663862131466} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1, y: 79} - m_SizeDelta: {x: 774, y: 168} + m_AnchoredPosition: {x: 0, y: 100} + m_SizeDelta: {x: 1080, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2083374691996212742 CanvasRenderer: @@ -25621,35 +25636,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8159760318667555204} m_CullTransparentMesh: 0 ---- !u!114 &8769783043410669971 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8159760318667555204} - 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: 4d36c605c1021d64cb9821bc78a96970, 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 &8605723377491586648 GameObject: m_ObjectHideFlags: 0 @@ -25690,3 +25676,204 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8641541037346281965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6555119479214560136} + - component: {fileID: 212180146202006074} + - component: {fileID: 1986253475210807402} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6555119479214560136 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8641541037346281965} + 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: 8881225554939750768} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -301.3, y: 71.9} + m_SizeDelta: {x: 226, y: 130} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &212180146202006074 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8641541037346281965} + m_CullTransparentMesh: 0 +--- !u!114 &1986253475210807402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8641541037346281965} + 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: 9c8d9a236f4a1b4438f615fb45d43ca4, 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 &8853004861365666409 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2000843886066404057} + - component: {fileID: 4886217357639763030} + - component: {fileID: 5867291691507138691} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2000843886066404057 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8853004861365666409} + 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: 8881225554939750768} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 31.500011, y: -34.2} + m_SizeDelta: {x: 847.4, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4886217357639763030 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8853004861365666409} + m_CullTransparentMesh: 0 +--- !u!114 &5867291691507138691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8853004861365666409} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9333334, g: 0.8941177, b: 0.76470596, 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_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 300 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7EDD\u6280\u5BF9\u8840\u91CF\u6700\u597D\u963F\u5FB7\u654C\u4EBA\u5355\u4F4D\u9020\u6210\u4F24\u5230\u540E\u671F\u5509\u54E6\u8FD8\u662F\u6709\u8BB0\u5F55\u9644\u52A0\u7729\u6655\u6548\u679C" + LanguageIndex: 0 +--- !u!1 &9112706560674106985 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8881225554939750768} + - component: {fileID: 3225316007707473253} + m_Layer: 0 + m_Name: talisman + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8881225554939750768 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9112706560674106985} + 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: + - {fileID: 6555119479214560136} + - {fileID: 1214804237868224621} + - {fileID: 2000843886066404057} + m_Father: {fileID: 1627151663862131466} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -101.1} + m_SizeDelta: {x: 1080, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3225316007707473253 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9112706560674106985} + m_CullTransparentMesh: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua index 0a2b785d2d..ea6039f153 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua @@ -20,6 +20,7 @@ function BattleBossInfoPanel:InitComponent() self.posTextZh = Util.GetGameObject(self.gameObject,"bg2/content/Pos/PosTextZh"):GetComponent("Text") self.posTextOther = Util.GetGameObject(self.gameObject,"bg2/content/Pos/PosTexOther"):GetComponent("Text") + self.Text = Util.GetGameObject(self.gameObject,"content/Text"):GetComponent("Text") self.skillText = Util.GetGameObject(self.gameObject,"content/Detail/skill/Text"):GetComponent("Text") self.talismanText = Util.GetGameObject(self.gameObject,"content/Detail/talisman/Text"):GetComponent("Text") self.ani1 = Util.GetGameObject(self.gameObject,"ani") @@ -27,9 +28,7 @@ function BattleBossInfoPanel:InitComponent() self.effect = Util.GetGameObject(self.gameObject,"UI_effect_RecruitPanel_particle") - self.Img1 = Util.GetGameObject(self.gameObject,"bg2/Image1"):GetComponent("RectTransform") - self.Img2 = Util.GetGameObject(self.gameObject,"bg2/Image2"):GetComponent("RectTransform") - self.Img3 = Util.GetGameObject(self.gameObject,"bg2/Image3"):GetComponent("RectTransform") + self.Img1 = Util.GetGameObject(self.gameObject,"bg2/Image1"):GetComponent("Image") end @@ -40,6 +39,12 @@ function BattleBossInfoPanel:BindEvent() self.timer1:Stop() self.timer1 = nil end + self.Img1:DOFade(0,0.7) + if self.timer2 then + self.timer2:Stop() + self.timer2 = nil + end + self.effect:SetActive(false) PlayUIAnim(self.ani1) PlayUIAnim(self.ani2) Timer.New(function () @@ -80,12 +85,35 @@ function BattleBossInfoPanel:OnShow() self.timer1 = Timer.New(function () PlayUIAnim(self.ani1) PlayUIAnim(self.ani2) + self.effect:SetActive(false) + if self.timer2 then + self.timer2:Stop() + self.timer2 = nil + end + self.Img1:DOFade(0,0.7) Timer.New(function () self:ClosePanel() end,0.7):Start() end,time) self.timer1:Start() + local thread2=coroutine.start(function() + coroutine.wait(0.5) + self.Img1:DOFade(0.4,1) + coroutine.wait(1) + self.Img1:DOFade(1,1) + coroutine.wait(1) + end) + self.timer2 = Timer.New(function () + local thread=coroutine.start(function() + self.Img1:DOFade(0.4,1) + coroutine.wait(1) + self.Img1:DOFade(1,1) + coroutine.wait(1) + end) + end, 2, 4, true) + self.timer2:Start() + --Pos local GetcurLanguage = 0--为后期多语言 self.nameZh.text = heroData.ReadingName @@ -114,11 +142,9 @@ function BattleBossInfoPanel:OnShow() --Bottom self.skillText.text = bossData.Skilltips self.talismanText.text = bossData.Treasuretips + self.Text.text = bossData.HeroLocationDesc1 - --bg - self.Img1:DOShakeAnchorPos(time, Vector2.New(10, 10), 1, 50, false, false) - self.Img2:DOShakeAnchorPos(time, Vector2.New(10, 10), 1, 50, false, false) - self.Img3:DOShakeAnchorPos(time, Vector2.New(10, 10), 1, 50, false, false) + end @@ -128,6 +154,10 @@ function BattleBossInfoPanel:OnClose() self.timer1:Stop() self.timer1 = nil end + if self.timer2 then + self.timer2:Stop() + self.timer2 = nil + end if func then func() end