diff --git a/Assets/ManagedResources/ArtFont_en/icon_chenghao35_en.png.meta b/Assets/ManagedResources/ArtFont_en/icon_chenghao35_en.png.meta index d003327e52..9eeae589da 100644 --- a/Assets/ManagedResources/ArtFont_en/icon_chenghao35_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/icon_chenghao35_en.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - 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: [] diff --git a/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_dongtian_en.png.meta b/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_dongtian_en.png.meta index cae7c4cf4d..547322d59c 100644 --- a/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_dongtian_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_dongtian_en.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - 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: [] diff --git a/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_fudi_en.png.meta b/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_fudi_en.png.meta index bf3e2d0c17..f3338f4b36 100644 --- a/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_fudi_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_fudi_en.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - 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: [] diff --git a/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_luofu_en.png.meta b/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_luofu_en.png.meta index cc02922b2c..32e521b893 100644 --- a/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_luofu_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_luofu_en.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - 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: [] diff --git a/Assets/ManagedResources/ArtFont_en/r_hero_tujian_lianghao_en.png b/Assets/ManagedResources/ArtFont_en/r_hero_tujian_lianghao_en.png new file mode 100644 index 0000000000..a96c5944ce Binary files /dev/null and b/Assets/ManagedResources/ArtFont_en/r_hero_tujian_lianghao_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/r_hero_tujian_lianghao_en.png.meta b/Assets/ManagedResources/ArtFont_en/r_hero_tujian_lianghao_en.png.meta new file mode 100644 index 0000000000..9c0876d424 --- /dev/null +++ b/Assets/ManagedResources/ArtFont_en/r_hero_tujian_lianghao_en.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 3288337409d79c549a35245f45262dae +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: ceec32d44c9ea114d90e4ed712b67371 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/ArtFont_en/r_hero_tujian_putong_en.png b/Assets/ManagedResources/ArtFont_en/r_hero_tujian_putong_en.png new file mode 100644 index 0000000000..2e38cc5ac6 Binary files /dev/null and b/Assets/ManagedResources/ArtFont_en/r_hero_tujian_putong_en.png differ diff --git a/Assets/ManagedResources/ArtFont_en/r_hero_tujian_putong_en.png.meta b/Assets/ManagedResources/ArtFont_en/r_hero_tujian_putong_en.png.meta new file mode 100644 index 0000000000..d382b8efde --- /dev/null +++ b/Assets/ManagedResources/ArtFont_en/r_hero_tujian_putong_en.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 925f740e7c946b74db88ce4317311d95 +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: 6681f3286cdb6ad4a97cbd97518b5191 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/ArtFont_vi/r_hero_tujian_lianghao_vi.png b/Assets/ManagedResources/ArtFont_vi/r_hero_tujian_lianghao_vi.png new file mode 100644 index 0000000000..fb030a14b4 Binary files /dev/null and b/Assets/ManagedResources/ArtFont_vi/r_hero_tujian_lianghao_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/r_hero_tujian_lianghao_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/r_hero_tujian_lianghao_vi.png.meta new file mode 100644 index 0000000000..77c360649e --- /dev/null +++ b/Assets/ManagedResources/ArtFont_vi/r_hero_tujian_lianghao_vi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: f308fad4008e02740b2049752dbae62a +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: da9a0d154ec9b224aa43f12e2d7aea06 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/ArtFont_vi/r_hero_tujian_putong_vi.png b/Assets/ManagedResources/ArtFont_vi/r_hero_tujian_putong_vi.png new file mode 100644 index 0000000000..8bbe09a82f Binary files /dev/null and b/Assets/ManagedResources/ArtFont_vi/r_hero_tujian_putong_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/r_hero_tujian_putong_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/r_hero_tujian_putong_vi.png.meta new file mode 100644 index 0000000000..2c6560064e --- /dev/null +++ b/Assets/ManagedResources/ArtFont_vi/r_hero_tujian_putong_vi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 5a8141dbe77ca634aa870005749dc9ec +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - 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: fa3894e8fe38a9e48b82a5bf342b9f90 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_lianghao.png b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_lianghao_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_lianghao.png rename to Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_lianghao_zh.png diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_lianghao.png.meta b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_lianghao_zh.png.meta similarity index 96% rename from Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_lianghao.png.meta rename to Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_lianghao_zh.png.meta index e2f8298a09..714e3e3c1e 100644 --- a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_lianghao.png.meta +++ b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_lianghao_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b8501f93d0e2f9e4083937f8b5f653cf +guid: baef913ae36e7154eada53c384adfbb8 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: 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 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -91,13 +80,24 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - 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: 7f29bc0dc395348449a2bb458e7d1361 + spriteID: a01fc6f3c4bcdee4cab6732cc2e12a54 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_putong.png b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_putong_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_putong.png rename to Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_putong_zh.png diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_putong.png.meta b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_putong_zh.png.meta similarity index 96% rename from Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_putong.png.meta rename to Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_putong_zh.png.meta index 26ed98b82f..37bc3c6f65 100644 --- a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_putong.png.meta +++ b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_tujian_putong_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 49deecf0d6109164a95fe5191d5476b4 +guid: 263e93f927b03e4408428b3f02ac661f TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: 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 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -91,13 +80,24 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - 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: 52a9128aecb4b5a40af9e287dafff998 + spriteID: 67e7996c6ba875c4ba3df063bd769265 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab index 6e398d399d..3f3f89ade5 100644 --- a/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab @@ -116,8 +116,8 @@ 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: -319.3, y: 69.68} - m_SizeDelta: {x: 335.3, y: 72} + m_AnchoredPosition: {x: -297.4, y: 69.68} + m_SizeDelta: {x: 379.25, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1870615583 CanvasRenderer: @@ -1785,7 +1785,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: -392.9, y: 76.9} + m_AnchoredPosition: {x: -395, y: 82.2} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6922793763514504574 diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index a4e187d9e5..d2064d40e9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -43231,6 +43231,7 @@ GameObject: - component: {fileID: 8635743836815067626} - component: {fileID: 1580013535689942728} - component: {fileID: 7776800244605522010} + - component: {fileID: 8091505310092424521} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -43254,8 +43255,8 @@ 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: 4.5, y: -15.4} - m_SizeDelta: {x: 290.07, y: 58.13} + m_AnchoredPosition: {x: 5.73, y: 12.5} + m_SizeDelta: {x: 298.7, y: 104.35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1580013535689942728 CanvasRenderer: @@ -43278,7 +43279,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.22352941, g: 0.23921569, b: 0.21568628, a: 1} + m_Color: {r: 0.9150943, g: 0.9150943, b: 0.9150943, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -43300,6 +43301,21 @@ MonoBehaviour: m_LineSpacing: 0.9 m_Text: "10\u7EA7\u89E3\u9501" LanguageIndex: 10529 +--- !u!114 &8091505310092424521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253535922273704610} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1291161524729645949 GameObject: m_ObjectHideFlags: 0 @@ -184971,7 +184987,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 50, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &109213283015355470 @@ -190680,7 +190696,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: -1.4, y: 20} + m_AnchoredPosition: {x: -1.4, y: 8.9} m_SizeDelta: {x: 106, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5098740035786950459 diff --git a/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab index db55e5234a..b98d43a972 100644 --- a/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab @@ -483,7 +483,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -0.000010729} - m_SizeDelta: {x: 266, y: 80} + m_SizeDelta: {x: 320, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1784806911 CanvasRenderer: @@ -923,7 +923,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 6.4} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &163235894452909320 @@ -964,7 +964,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4E00\u952E\u79FB\u9664" @@ -2677,7 +2677,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0.00000071526} - m_SizeDelta: {x: 266, y: 80} + m_SizeDelta: {x: 320, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6026135954506998824 CanvasRenderer: @@ -2997,7 +2997,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6695374628307615825 RectTransform: m_ObjectHideFlags: 0 @@ -3532,7 +3532,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -6, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3964181115500194970 @@ -3628,7 +3628,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -186, y: 0} - m_SizeDelta: {x: 157, y: 69} + m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6698828797557270983 CanvasRenderer: @@ -3743,8 +3743,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 2.15, y: 4} + m_SizeDelta: {x: -53.71, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2638926629760914281 CanvasRenderer: @@ -3784,7 +3784,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u641C\u7D22" @@ -4225,7 +4225,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: 0} + m_AnchoredPosition: {x: -5.9999695, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3798063570617825716 @@ -4824,7 +4824,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 4.0999756} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7581093011219131281 @@ -4865,7 +4865,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4E00\u952E\u8D60\u9001" @@ -4945,7 +4945,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5220\u9664\u597D\u53CB" @@ -5837,7 +5837,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.00024414062} + m_AnchoredPosition: {x: 0, y: 6.7} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1399345212605990241 @@ -5996,7 +5996,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -199, y: -2} - m_SizeDelta: {x: 192.1, y: 57.8} + m_SizeDelta: {x: 300, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6087906825317427632 CanvasRenderer: @@ -6226,7 +6226,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: 0} + m_AnchoredPosition: {x: 0.000030517578, y: 4.1} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6172095669762159628 @@ -6267,7 +6267,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4E00\u952E\u9886\u53D6" @@ -6498,7 +6498,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 282, y: 3.5999384} - m_SizeDelta: {x: 157, y: 69} + m_SizeDelta: {x: 160, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6240566858730814288 CanvasRenderer: @@ -6613,8 +6613,8 @@ 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: -268.2, y: 0} - m_SizeDelta: {x: 404, y: 79.9} + m_AnchoredPosition: {x: -271.56, y: 0} + m_SizeDelta: {x: 410.72, y: 79.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2302512082654518972 CanvasRenderer: @@ -6790,7 +6790,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -539.72076, y: -76.9043} - m_SizeDelta: {x: 1079, y: 76.900024} + m_SizeDelta: {x: 1079, y: 85} m_Pivot: {x: 0, y: 0} --- !u!222 &1709735489990748429 CanvasRenderer: @@ -6944,8 +6944,8 @@ 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: 335, y: 14.000009} - m_SizeDelta: {x: 266, y: 80} + m_AnchoredPosition: {x: 335, y: 14} + m_SizeDelta: {x: 320, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3862217738249413897 CanvasRenderer: @@ -7709,8 +7709,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 2.36, y: 0} + m_SizeDelta: {x: -64.05, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9211393953510095148 CanvasRenderer: @@ -7750,7 +7750,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4E00\u952E\u7533\u8BF7" @@ -8385,7 +8385,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 449, y: 3.5998392} - m_SizeDelta: {x: 157, y: 69} + m_SizeDelta: {x: 160, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2577620647217107044 CanvasRenderer: @@ -8729,8 +8729,8 @@ 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: 204.20001, y: 4} - m_SizeDelta: {x: 157, y: 69} + m_AnchoredPosition: {x: 215, y: 4} + m_SizeDelta: {x: 180, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6964111333087132512 CanvasRenderer: @@ -9080,7 +9080,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 119, y: 3.6} - m_SizeDelta: {x: 157, y: 69} + m_SizeDelta: {x: 160, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3908472251570575077 CanvasRenderer: @@ -9368,8 +9368,8 @@ 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: 390, y: 4.0000105} - m_SizeDelta: {x: 157, y: 69} + m_AnchoredPosition: {x: 404, y: 4.0000105} + m_SizeDelta: {x: 180, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8599259543382607327 CanvasRenderer: @@ -10571,7 +10571,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u8D60\u9001\u53CB\u60C5\u70B9" @@ -10610,7 +10610,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: 0} + m_AnchoredPosition: {x: 0.000030517578, y: 3.5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3902932180056122781 @@ -10731,7 +10731,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u53D1\u9001\u4FE1\u606F" @@ -10849,7 +10849,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 401, y: -6} - m_SizeDelta: {x: 206.9, y: 85.2} + m_SizeDelta: {x: 250, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4083432037181998826 CanvasRenderer: @@ -11066,7 +11066,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 341, y: 5.3999996} - m_SizeDelta: {x: 157, y: 69} + m_SizeDelta: {x: 180, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4093213092512453996 CanvasRenderer: @@ -11185,7 +11185,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -5, y: 14} - m_SizeDelta: {x: 266, y: 80} + m_SizeDelta: {x: 320, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6795276963784613702 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab index 5461db2262..8dc27c3805 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab @@ -5762,61 +5762,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 5241545812692379104} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 2585553325871096394} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 4142001820164508088} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 4568209856260496831} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 5380482381554331836} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 1426331065034095957} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 474627824736454564} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 3558236661168655099} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 7941729399253262465} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 8296293532821803369} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 5241545812692379104} + propertyPath: m_SizeDelta.y + value: 240 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -5872,6 +5822,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 3193327114435574989} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 5241545812692379104} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 2585553325871096394} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 4142001820164508088} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 4568209856260496831} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 5380482381554331836} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 1426331065034095957} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 474627824736454564} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 3558236661168655099} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 7941729399253262465} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 8296293532821803369} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 5241545812692379104} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &4142001820164508088 stripped @@ -6117,61 +6122,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 4723301591924150650} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 3085111900585481936} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 3479707278263156002} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 3914953304232323365} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 4871328922841711654} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 1943979900330052047} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 1127879704015336254} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 4057842789547834977} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 7424059944348832795} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 8796485426239825395} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 4723301591924150650} + propertyPath: m_SizeDelta.y + value: 240 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -6227,6 +6182,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 2693651720773568599} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 4723301591924150650} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 3085111900585481936} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 3479707278263156002} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 3914953304232323365} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 4871328922841711654} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 1943979900330052047} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 1127879704015336254} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 4057842789547834977} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 7424059944348832795} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 8796485426239825395} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 4723301591924150650} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &7979422184701890409 stripped @@ -6472,61 +6482,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 8611487282664064190} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 2080147522414379796} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 451706444990261478} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 25361896577383649} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 8472607989130351074} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 3239434623502867467} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 4155036120987838202} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 1035534686378634149} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 5839234556985541087} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 5484763296714043447} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 8611487282664064190} + propertyPath: m_SizeDelta.y + value: 240 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -6582,6 +6542,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 1400454818992315795} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 8611487282664064190} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 2080147522414379796} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 451706444990261478} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 25361896577383649} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 8472607989130351074} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 3239434623502867467} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 4155036120987838202} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 1035534686378634149} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 5839234556985541087} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 5484763296714043447} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 8611487282664064190} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &6609047014600022657 stripped @@ -6827,12 +6842,17 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 @@ -6843,61 +6863,6 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1, type: 3} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 8574305067057897920} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 2135269379397789290} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 520415995300089240} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 82808119570078111} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 8424241604099667100} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 3281122643625933173} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 4095333775935308676} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 1090678456252665563} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 5797553208555611297} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 5575984249666835785} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 8574305067057897920} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -6953,6 +6918,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 1302456415698843885} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 8574305067057897920} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 2135269379397789290} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 520415995300089240} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 82808119570078111} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 8424241604099667100} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 3281122643625933173} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 4095333775935308676} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 1090678456252665563} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 5797553208555611297} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 5575984249666835785} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 8574305067057897920} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &2903564341044661558 stripped @@ -7198,12 +7218,17 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 @@ -7214,61 +7239,6 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1, type: 3} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 8549632998381258730} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 2160154155244470336} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 531578114395040690} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 107621737450340277} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 8408365602720518838} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 3301291653795946335} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 4075164693795235246} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 1115404704838641905} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 5777382750982652555} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 5564629226414994275} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 8549632998381258730} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -7324,6 +7294,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 1318193324573597383} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 8549632998381258730} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 2160154155244470336} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 531578114395040690} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 107621737450340277} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 8408365602720518838} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 3301291653795946335} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 4075164693795235246} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 1115404704838641905} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 5777382750982652555} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 5564629226414994275} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 8549632998381258730} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &107621737450340277 stripped @@ -7569,61 +7594,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 3441018239529534220} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 4944106814197925030} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 6775134897558662996} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 6348051651280190291} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 3302851320485008976} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 8409941743193906105} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 7055859148882551112} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 6204870235896523799} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 669898560522618477} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 1467926079674890117} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 3441018239529534220} + propertyPath: m_SizeDelta.y + value: 240 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -7679,6 +7654,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 5417196937268255265} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 3441018239529534220} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 4944106814197925030} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 6775134897558662996} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 6348051651280190291} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 3302851320485008976} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 8409941743193906105} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 7055859148882551112} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 6204870235896523799} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 669898560522618477} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 1467926079674890117} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 3441018239529534220} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &7204979126876394974 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab index 49f97f746c..13a9ab6dd5 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab @@ -5341,41 +5341,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 45.09 objectReference: {fileID: 0} - - target: {fileID: 4346577556544649856, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 4346577556544649856, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.x - value: 313.95 - objectReference: {fileID: 0} - - target: {fileID: 4346577556544649856, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.y - value: 400.39 - objectReference: {fileID: 0} - - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -119.8 - objectReference: {fileID: 0} - - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 83.05 - objectReference: {fileID: 0} - - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.x - value: 37.64 - objectReference: {fileID: 0} - - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.y - value: 132.1 - objectReference: {fileID: 0} - target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x @@ -5396,45 +5361,40 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 380.6 objectReference: {fileID: 0} - - target: {fileID: 3931285137136619946, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -123.8 + objectReference: {fileID: 0} + - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000021935 + value: 91.67 objectReference: {fileID: 0} - - target: {fileID: 3931285137136619946, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_SizeDelta.x - value: 48.75 + value: 88.11 objectReference: {fileID: 0} - - target: {fileID: 3931285137136619946, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2534974135485703921, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_SizeDelta.y - value: 132.1 + value: 140.1 objectReference: {fileID: 0} - - target: {fileID: 2320518946443230269, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 4346577556544649856, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_AnchoredPosition.y + value: 0.1 objectReference: {fileID: 0} - - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 4346577556544649856, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_SizeDelta.x + value: 313.95 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 4346577556544649856, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2320031820122894205, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2320031818592630692, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_SizeDelta.y + value: 400.39 objectReference: {fileID: 0} - target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -5446,6 +5406,71 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2320031820122894205, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2320031818592630692, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2320518946443230269, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3931285137136619946, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3931285137136619946, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3931285137136619946, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3931285137136619946, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3931285137136619946, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3931285137136619946, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.34 + objectReference: {fileID: 0} + - target: {fileID: 3931285137136619946, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.x + value: 51.43 + objectReference: {fileID: 0} + - target: {fileID: 3931285137136619946, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: -52.1 + objectReference: {fileID: 0} - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x @@ -5483,6 +5508,31 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 97859e9d8daa1c24d8a6953d20ebad66, type: 3} + - target: {fileID: 6730520942443440465, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Color.r + value: 0.98039216 + objectReference: {fileID: 0} + - target: {fileID: 6730520942443440465, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Color.g + value: 0.94509804 + objectReference: {fileID: 0} + - target: {fileID: 6730520942443440465, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Color.b + value: 0.8666667 + objectReference: {fileID: 0} + - target: {fileID: 6730520942443440465, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 6730520942443440465, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 30 + objectReference: {fileID: 0} - target: {fileID: 3783835374178447715, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Color.r @@ -5518,87 +5568,6 @@ PrefabInstance: propertyPath: m_Text value: 254 objectReference: {fileID: 0} - - target: {fileID: 6730520942443440465, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Color.r - value: 0.98039216 - objectReference: {fileID: 0} - - target: {fileID: 6730520942443440465, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Color.g - value: 0.94509804 - objectReference: {fileID: 0} - - target: {fileID: 6730520942443440465, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Color.b - value: 0.8666667 - objectReference: {fileID: 0} - - target: {fileID: 6730520942443440465, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, - type: 3} - - target: {fileID: 6730520942443440465, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_FontData.m_FontSize - value: 28 - objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 3289790066112278941} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 5114861618318833207} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 6656672308102520261} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 6521091515858831810} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 3436607979250984129} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 8561694787768035624} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 7173161058199327705} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 6087597738671136390} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 805203461045515516} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 1601103905695646996} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 3289790066112278941} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -5654,6 +5623,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 5281282623979792560} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 3289790066112278941} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 5114861618318833207} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 6656672308102520261} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 6521091515858831810} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 3436607979250984129} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 8561694787768035624} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 7173161058199327705} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 6087597738671136390} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 805203461045515516} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 1601103905695646996} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 3289790066112278941} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &313910608617404809 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab index 433c2b6103..eb07bde130 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab @@ -36,8 +36,8 @@ 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: -0.34, y: -0.00012207031} - m_SizeDelta: {x: 868.34, y: 250} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 868.34, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7253362 CanvasRenderer: @@ -15654,8 +15654,8 @@ 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: -0.34, y: -0.00012207031} - m_SizeDelta: {x: 868.34, y: 250} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 868.34, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2926854930664588057 CanvasRenderer: @@ -16037,7 +16037,7 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 250 + m_PreferredHeight: 300 m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -26876,8 +26876,8 @@ 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: -0.34, y: -0.00012207031} - m_SizeDelta: {x: 868.34, y: 250} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 868.34, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5504480397866606716 CanvasRenderer: @@ -49856,7 +49856,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: 0.000042437583, y: 10} + m_AnchoredPosition: {x: -0.000017382597, y: 10} m_SizeDelta: {x: 0, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8072862713034857029 @@ -104159,7 +104159,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: 0.000042437583, y: 10} + m_AnchoredPosition: {x: -0.000017382597, y: 10} m_SizeDelta: {x: 0, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2834337415833886244 @@ -120697,8 +120697,8 @@ 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: -0.34, y: -0.00012207031} - m_SizeDelta: {x: 868.34, y: 250} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 868.34, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &609768617542550001 CanvasRenderer: @@ -121202,7 +121202,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 441.25, y: 0} m_SizeDelta: {x: 895.3, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8905667472897453265 @@ -127123,8 +127123,8 @@ 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: -0.34, y: -0.00012207031} - m_SizeDelta: {x: 868.34, y: 250} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 868.34, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2188475380265573030 CanvasRenderer: @@ -171862,7 +171862,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: 0.000042468815, y: 0} + m_AnchoredPosition: {x: -0.000018538776, y: 0} m_SizeDelta: {x: 0, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1473205862085400439 @@ -172130,8 +172130,8 @@ 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: -0.34, y: -0.00012207031} - m_SizeDelta: {x: 868.34, y: 250} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 868.34, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1590220923705176662 CanvasRenderer: @@ -172958,8 +172958,8 @@ 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: -0.34, y: -0.00012207031} - m_SizeDelta: {x: 868.34, y: 250} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 868.34, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2969042710309720145 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab index ad274d3ade..3b7d2d6b35 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab @@ -1963,7 +1963,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.08, y: 108.53} - m_SizeDelta: {x: 51.22, y: 217.7} + m_SizeDelta: {x: 51.22, y: 307.97} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7232221904568794684 CanvasRenderer: @@ -2038,7 +2038,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50.2, y: -0} + m_AnchoredPosition: {x: 37.8, y: -0} m_SizeDelta: {x: 52.4, y: 218.1} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5765816421488786280 @@ -2323,8 +2323,8 @@ 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: 0, y: -82.7} - m_SizeDelta: {x: 835.3, y: 68.2} + m_AnchoredPosition: {x: 24.95, y: -103} + m_SizeDelta: {x: 785.41, y: 108.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1831545724925285107 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index 1a4d200440..dd02ba6315 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -48856,10 +48856,10 @@ RectTransform: m_Father: {fileID: 224688690836167678} 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_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1920} + m_SizeDelta: {x: 1080, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222210643621885542 CanvasRenderer: @@ -54207,10 +54207,10 @@ RectTransform: m_Father: {fileID: 224688690836167678} 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.000012398, y: -896.32} - m_SizeDelta: {x: 1080, y: 127.35} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 63.679993} + m_SizeDelta: {x: 0, y: 127.349976} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222839184784845028 CanvasRenderer: @@ -61421,9 +61421,9 @@ RectTransform: m_Father: {fileID: 224688690836167678} 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: -9.3, y: 447} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 24, y: -543} m_SizeDelta: {x: 658, y: 632} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222286758884224434 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua index 6f8532a974..94c786d53a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua @@ -268,7 +268,7 @@ function this.SetCardSingleData(o, heroId, _pos, heroData) SetCardStars(starGrid, heroData.Star) SetHeroFormationFlyEffect(o, this.spLoader, Util.GetGameObject(o, "UI_Effect_jinkuang_KaPai"), heroData.Star, 401) name.text = GetLanguageStrById(heroData.ReadingName) - SetTextVerTial(name.gameObject, Vector3.New(34.5, -7.5, 0), nil, nil, 6) + --SetTextVerTial(name.gameObject, Vector3.New(34.5, -7.5, 0), nil, nil, 6) end --刷新排行榜 index当前排行类型索引 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyOpenPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyOpenPopup.lua index 42c242e98d..c0521ec6da 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyOpenPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyOpenPopup.lua @@ -53,7 +53,7 @@ function HeroPotencyOpenPopup:OnOpen(...) local args = { ... } this.effect:SetActive(true) local config = ConfigManager.GetConfigDataByKey(ConfigName.PotentialNewConfig, "Type", args[1]) - this.info.text = GetLanguageStrById(config.Name) .. Language[11504] + this.info.text = GetLanguageStrById(config.Name) .." ".. Language[11504] end function HeroPotencyOpenPopup:OnShow() diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index 9fca726f83..813e112558 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -84,7 +84,7 @@ function FourElementMonsterCampPanel:BindEvent() PopupTipPanel.ShowTip(string.format(Language[10320], GetLanguageStrById(itemConfig[itemId].Name))) return end - MsgPanel.ShowTwo(string.format(Language[10684], costNum, itemConfig[itemId].Name), function() end, function() + MsgPanel.ShowTwo(string.format(Language[10684], costNum, GetLanguageStrById(itemConfig[itemId].Name)), function() end, function() ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP, storeDataId, 1, function() PrivilegeManager.RefreshPrivilegeUsedTimes(trailData.buyTimeId, 1) this.UpdatePrivilage()