diff --git a/Assets/ManagedResources/Atlas/AdventureAltas/ArtFont.meta b/Assets/ManagedResources/Atlas/AdventureAltas/ArtFont.meta deleted file mode 100644 index 368a52f34b..0000000000 --- a/Assets/ManagedResources/Atlas/AdventureAltas/ArtFont.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 37d52d872b24e574f8d8c7e458686388 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/CarbonNewAtlas.meta b/Assets/ManagedResources/Atlas/CarbonNewAtlas.meta deleted file mode 100644 index 83122a8ef4..0000000000 --- a/Assets/ManagedResources/Atlas/CarbonNewAtlas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cdedee4e5ccd7034b9a7619aaf7c34ef -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/CarbonNewAtlas/ArtFont.meta b/Assets/ManagedResources/Atlas/CarbonNewAtlas/ArtFont.meta deleted file mode 100644 index 712d1e5015..0000000000 --- a/Assets/ManagedResources/Atlas/CarbonNewAtlas/ArtFont.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 88efe01e0de2afb4194bb6bd69385df6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/CommonAtlas.meta b/Assets/ManagedResources/Atlas/CommonAtlas.meta deleted file mode 100644 index 807ab0f403..0000000000 --- a/Assets/ManagedResources/Atlas/CommonAtlas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 68fb55bf803e669418eff563cab90f9b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: lz4/atlas/commonatlas - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/PieceMask_Platinum_01.png b/Assets/ManagedResources/Atlas/CommonAtlas/PieceMask_Platinum_01.png deleted file mode 100644 index a4d13d67a7..0000000000 Binary files a/Assets/ManagedResources/Atlas/CommonAtlas/PieceMask_Platinum_01.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/PieceMask_goden_01.png b/Assets/ManagedResources/Atlas/CommonAtlas/PieceMask_goden_01.png deleted file mode 100644 index 810277b10a..0000000000 Binary files a/Assets/ManagedResources/Atlas/CommonAtlas/PieceMask_goden_01.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png b/Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png deleted file mode 100644 index d937b74db8..0000000000 Binary files a/Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png b/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png deleted file mode 100644 index b6607318ab..0000000000 Binary files a/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_jiahao.png b/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_jiahao.png deleted file mode 100644 index e70b502e0b..0000000000 Binary files a/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_jiahao.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_jiahao.png.meta b/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_jiahao.png.meta deleted file mode 100644 index 35f97aef7e..0000000000 --- a/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_jiahao.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: f0de54808b5704c45bc7571f0b2fcab6 -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: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 56 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: bc9b4475dde391d4aaeb1a6aeeec6d92 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: CommonAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_wenhao.png b/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_wenhao.png deleted file mode 100644 index 36f63ebbd2..0000000000 Binary files a/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_wenhao.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_wenhao.png.meta b/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_wenhao.png.meta deleted file mode 100644 index eaab78662b..0000000000 --- a/Assets/ManagedResources/Atlas/CommonAtlas/y_yosr_wenhao.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 384990eabdc5a0b40a1690c1d73ee64c -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: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 56 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 8d38d176944b534468c95ea400e77caf - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: CommonAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DiffMonsterAtlas/ArtFont.meta b/Assets/ManagedResources/Atlas/DiffMonsterAtlas/ArtFont.meta deleted file mode 100644 index 02ff587ec4..0000000000 --- a/Assets/ManagedResources/Atlas/DiffMonsterAtlas/ArtFont.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b7c1cec5eac22af4d938277a18be884c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/JumpServer/UI_hz_zhonghe05_98.png b/Assets/ManagedResources/Atlas/JumpServer/UI_hz_zhonghe05_98.png new file mode 100644 index 0000000000..c92febc804 Binary files /dev/null and b/Assets/ManagedResources/Atlas/JumpServer/UI_hz_zhonghe05_98.png differ diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/PieceMask_Platinum_01.png.meta b/Assets/ManagedResources/Atlas/JumpServer/UI_hz_zhonghe05_98.png.meta similarity index 95% rename from Assets/ManagedResources/Atlas/CommonAtlas/PieceMask_Platinum_01.png.meta rename to Assets/ManagedResources/Atlas/JumpServer/UI_hz_zhonghe05_98.png.meta index 872fdc906d..d7c68aa2af 100644 --- a/Assets/ManagedResources/Atlas/CommonAtlas/PieceMask_Platinum_01.png.meta +++ b/Assets/ManagedResources/Atlas/JumpServer/UI_hz_zhonghe05_98.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 672bc172a1bd37c49b3fa62cfa32b00c +guid: e70dd6b8466df8b4882e22fd021d69af TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,12 +97,12 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: f35763d8ae1056342a34615302c002a5 + spriteID: 072652029c17f9b4b990a78953ccbd35 vertices: [] indices: edges: [] weights: [] - spritePackingTag: CommonAtlas + spritePackingTag: JumpServer pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_12.png b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_12.png new file mode 100644 index 0000000000..29f50dc539 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_12.png differ diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/PieceMask_goden_01.png.meta b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_12.png.meta similarity index 91% rename from Assets/ManagedResources/Atlas/CommonAtlas/PieceMask_goden_01.png.meta rename to Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_12.png.meta index 8b2df47ef8..39b3967f0f 100644 --- a/Assets/ManagedResources/Atlas/CommonAtlas/PieceMask_goden_01.png.meta +++ b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_12.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5724c4d71b6000a47a8946c2dc01aeb4 +guid: 0fc6aa8c4c8686a45827426cce6cc103 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -73,7 +73,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 56 + textureFormat: 57 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -81,15 +81,15 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 - serializedVersion: 2 - buildTarget: DefaultTexturePlatform + buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 @@ -97,12 +97,12 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5006eb3cdb592284992196779da8f460 + spriteID: 5b7a9e1baef5d4143bc3a8f86e931d0e vertices: [] indices: edges: [] weights: [] - spritePackingTag: CommonAtlas + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_13.png b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_13.png new file mode 100644 index 0000000000..5e3be098df Binary files /dev/null and b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_13.png differ diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png.meta b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_13.png.meta similarity index 91% rename from Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png.meta rename to Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_13.png.meta index 822148a6f5..0b7b053e54 100644 --- a/Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png.meta +++ b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_13.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e5d62ef53f4e50b4c82c34fb24fff4bd +guid: 14de214bc71a54a4f912bd00874f57e5 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -73,7 +73,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 56 + textureFormat: 57 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -81,15 +81,15 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 - serializedVersion: 2 - buildTarget: DefaultTexturePlatform + buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 @@ -97,12 +97,12 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 885496b284131a6418b5a20738534dc6 + spriteID: 85a3c6e442ce5104e9ba0fe1220d599c vertices: [] indices: edges: [] weights: [] - spritePackingTag: CommonAtlas + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_14.png b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_14.png new file mode 100644 index 0000000000..b561133d33 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_14.png differ diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png.meta b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_14.png.meta similarity index 91% rename from Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png.meta rename to Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_14.png.meta index 6f774bf130..dda46c6bab 100644 --- a/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png.meta +++ b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe03_14.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f9398964d6d4cdf4db9b39ec0fc5f348 +guid: ec571af34fa33624091b6ca3b065010a TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -70,21 +70,21 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 - serializedVersion: 2 - buildTarget: DefaultTexturePlatform + buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 57 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - serializedVersion: 2 - buildTarget: iPhone + buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 56 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -97,12 +97,12 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 3fddf2ac1c6314e428dfc61248e74267 + spriteID: f75056725dfcb6144b36136f0c0e6b8d vertices: [] indices: edges: [] weights: [] - spritePackingTag: CommonAtlas + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/DynamicAtlas/UI_hz_fs_12.png b/Assets/ManagedResources/DynamicAtlas/UI_hz_fs_12.png new file mode 100644 index 0000000000..1a52235aba Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/UI_hz_fs_12.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/UI_hz_fs_12.png.meta b/Assets/ManagedResources/DynamicAtlas/UI_hz_fs_12.png.meta new file mode 100644 index 0000000000..14c06d66ff --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/UI_hz_fs_12.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 83610b28edc0cf44988acd3f80a7db55 +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: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: d9c7eb50649f4cf43843eb567f0c1a8a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab index 863fcdf243..93c238ef2f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab @@ -14008,7 +14008,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: 20e1d22a0aae55948a2582d12a7e323a, type: 3} + m_Sprite: {fileID: 21300000, guid: 7b6a6fa5766d5b84b9c1feb57ddbb47c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index f10d9f0eb3..60a158fbae 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -43403,6 +43403,86 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &2004230519645381469 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1636711414651895099} + - component: {fileID: 4523721566213525253} + - component: {fileID: 6366647729510928565} + m_Layer: 5 + m_Name: titleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1636711414651895099 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2004230519645381469} + 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: 5738500445219371529} + 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: 21, y: 0} + m_SizeDelta: {x: 242.11, y: 39.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4523721566213525253 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2004230519645381469} + m_CullTransparentMesh: 0 +--- !u!114 &6366647729510928565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2004230519645381469} + 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.5686275, g: 0.40784314, b: 0.29411766, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u767B\u96461\u6B21" + LanguageIndex: 10001 --- !u!1 &2096591691250501803 GameObject: m_ObjectHideFlags: 0 @@ -54031,81 +54111,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &3056435828158568904 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1826624492284208546} - - component: {fileID: 4545410394449060312} - - component: {fileID: 2143909674079668626} - m_Layer: 5 - m_Name: titleImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1826624492284208546 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3056435828158568904} - 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: 4150052271114068735} - m_Father: {fileID: 2143589712445288076} - 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: -121, y: 66.39993} - m_SizeDelta: {x: 558, y: 44} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4545410394449060312 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3056435828158568904} - m_CullTransparentMesh: 0 ---- !u!114 &2143909674079668626 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3056435828158568904} - m_Enabled: 0 - 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: 7491ecf89cbc4344c9165af75629b7e4, 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 &3060279276647586194 GameObject: m_ObjectHideFlags: 0 @@ -58929,86 +58934,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &3060833455810408356 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4150052271114068735} - - component: {fileID: 1723110364857998802} - - component: {fileID: 8120163038180953306} - m_Layer: 5 - m_Name: titleText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4150052271114068735 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3060833455810408356} - 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: 1826624492284208546} - 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: -112.8, y: -16} - m_SizeDelta: {x: 242.11, y: 39.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1723110364857998802 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3060833455810408356} - m_CullTransparentMesh: 0 ---- !u!114 &8120163038180953306 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3060833455810408356} - 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.21698111, g: 0.16273583, b: 0.16273583, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 32 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u767B\u96461\u6B21" - LanguageIndex: 10001 --- !u!1 &3092361535337400171 GameObject: m_ObjectHideFlags: 0 @@ -79626,6 +79551,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4342519158331969454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5738500445219371529} + - component: {fileID: 7281135729660457134} + - component: {fileID: 2403687084934173307} + m_Layer: 5 + m_Name: titleImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5738500445219371529 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4342519158331969454} + 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: 1636711414651895099} + m_Father: {fileID: 2143589712445288076} + 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: -252, y: 59} + m_SizeDelta: {x: 297, y: 44} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7281135729660457134 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4342519158331969454} + m_CullTransparentMesh: 0 +--- !u!114 &2403687084934173307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4342519158331969454} + 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: 83610b28edc0cf44988acd3f80a7db55, 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 &4346589967240400969 GameObject: m_ObjectHideFlags: 0 @@ -110193,8 +110193,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: -121, y: 66.39993} - m_SizeDelta: {x: 558, y: 44} + m_AnchoredPosition: {x: -252, y: 48} + m_SizeDelta: {x: 297, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7585818912839897492 CanvasRenderer: @@ -110211,7 +110211,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5601578890170581088} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -110224,7 +110224,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: 7491ecf89cbc4344c9165af75629b7e4, type: 3} + m_Sprite: {fileID: 21300000, guid: 83610b28edc0cf44988acd3f80a7db55, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -174285,7 +174285,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7198073864249070706} - - {fileID: 1826624492284208546} + - {fileID: 5738500445219371529} - {fileID: 553958844504537425} - {fileID: 143539821124465396} - {fileID: 1387418776256987101} @@ -208114,7 +208114,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: -112.8, y: -16} + m_AnchoredPosition: {x: 21, y: 0} m_SizeDelta: {x: 242.11, y: 39.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8803283497968640721 @@ -208138,7 +208138,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.21568628, g: 0.16078432, b: 0.16078432, a: 1} + m_Color: {r: 0.5686275, g: 0.40784314, b: 0.29411766, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab index 5eae45d047..3244ef8699 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab @@ -6591,7 +6591,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: 45.5, y: -4} + m_AnchoredPosition: {x: -60, y: 20} m_SizeDelta: {x: 38, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3627422790413616579 @@ -7037,7 +7037,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: 45.5, y: -4} + m_AnchoredPosition: {x: -60, y: 20} m_SizeDelta: {x: 38, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3627422790625869917 @@ -8129,7 +8129,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: 45.5, y: -4} + m_AnchoredPosition: {x: -60, y: 20} m_SizeDelta: {x: 38, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3627422791172662453 @@ -8819,7 +8819,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: 45.5, y: -4} + m_AnchoredPosition: {x: -60, y: 20} m_SizeDelta: {x: 38, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3627422791727360683 @@ -9356,7 +9356,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: 45.5, y: -4} + m_AnchoredPosition: {x: -60, y: 20} m_SizeDelta: {x: 38, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3627422791961113517 @@ -13963,7 +13963,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: 45.5, y: -4} + m_AnchoredPosition: {x: -60, y: 20} m_SizeDelta: {x: 38, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4790291776222957662 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab index 63d15c3ade..83ed69dcaf 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab @@ -610,7 +610,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: 45.5, y: -4} + m_AnchoredPosition: {x: -59.99998, y: 20.000027} m_SizeDelta: {x: 38, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &511575475 @@ -833,7 +833,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: 45.5, y: -4} + m_AnchoredPosition: {x: -60, y: 20} m_SizeDelta: {x: 38, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &601210925 @@ -1926,7 +1926,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: 45.5, y: -4} + m_AnchoredPosition: {x: -59.99998, y: 20.000027} m_SizeDelta: {x: 38, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1086072005 @@ -2536,7 +2536,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: 45.5, y: -4} + m_AnchoredPosition: {x: -59.99998, y: 20.000027} m_SizeDelta: {x: 38, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1638673115 @@ -3068,7 +3068,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: 45.5, y: -4} + m_AnchoredPosition: {x: -59.99998, y: 20.000027} m_SizeDelta: {x: 38, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1917055965 @@ -12615,9 +12615,9 @@ RectTransform: m_Father: {fileID: 5306787189736440502} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 58, y: -71.2} m_SizeDelta: {x: 0, y: 101} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6149476631504047147 @@ -16458,7 +16458,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: 45.5, y: -4} + m_AnchoredPosition: {x: -59.99998, y: 20.000027} m_SizeDelta: {x: 38, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8083320532923191342 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 2022c87c7c..6199d199ec 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -31355,7 +31355,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: 132.07, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222314792653266900 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab index 12573a694e..9e6d56a2c0 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab @@ -5091,7 +5091,7 @@ PrefabInstance: - target: {fileID: 3679604669199410926, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3461300678615895712, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} @@ -5201,7 +5201,12 @@ PrefabInstance: - target: {fileID: 3461041183831773760, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_SizeDelta.x - value: 39 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3461869958402333818, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -176.6 objectReference: {fileID: 0} - target: {fileID: 3639078397396446894, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} @@ -5226,22 +5231,27 @@ PrefabInstance: - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_AnchoredPosition.x - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3680026035316547080, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 1165092670158494079, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} diff --git a/Assets/ManagedResources/Prefabs/UI/cardView/card.prefab b/Assets/ManagedResources/Prefabs/UI/cardView/card.prefab index a59593040b..d7f4927be6 100644 --- a/Assets/ManagedResources/Prefabs/UI/cardView/card.prefab +++ b/Assets/ManagedResources/Prefabs/UI/cardView/card.prefab @@ -472,13 +472,13 @@ RectTransform: - {fileID: 3461041183831773760} - {fileID: 3461416457997464738} - {fileID: 3880253530736025899} - - {fileID: 3461869958402333818} - {fileID: 1676758215422761462} - {fileID: 4191481690083456951} - {fileID: 3461425765958726042} - {fileID: 3461656373541963414} - {fileID: 5179794939376762791} - {fileID: 1025001012133774991} + - {fileID: 3461869958402333818} - {fileID: 3461089642499030670} - {fileID: 1298132580563460616} - {fileID: 9063074519281332817} @@ -602,7 +602,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -675,7 +675,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1001,7 +1001,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 16.51} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1136,7 +1136,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3461869958402333818 RectTransform: m_ObjectHideFlags: 0 @@ -1150,12 +1150,12 @@ RectTransform: m_Children: - {fileID: 3461094561493497734} m_Father: {fileID: 3396417040355110936} - m_RootOrder: 5 + m_RootOrder: 11 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: -60.099976, y: -188.7} - m_SizeDelta: {x: 54, y: 54} + m_AnchoredPosition: {x: -69.4, y: -159} + m_SizeDelta: {x: 35.6, y: 31.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3458935048380602088 CanvasRenderer: @@ -1185,7 +1185,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: 895a1069d68145244a20a7a3629262de, type: 3} + m_Sprite: {fileID: 21300000, guid: 4072d8ffe2facfe429f8a4224ce41df3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1303,7 +1303,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.2, y: 0} + m_AnchoredPosition: {x: -0.5, y: 0} m_SizeDelta: {x: 57.37, y: 35.96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3459576128698058178 @@ -1335,8 +1335,8 @@ MonoBehaviour: 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: 25 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -1393,7 +1393,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1503,7 +1503,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1766,7 +1766,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3396417040355110936} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2114,12 +2114,6 @@ PrefabInstance: objectReference: {fileID: 1271572592464149432} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} ---- !u!4 &1271572592464149430 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 1745768441} - m_PrefabAsset: {fileID: 0} --- !u!4 &1271572592464149428 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572593135907917, guid: 4c8639a41d5af934d933d50f22d40218, @@ -2234,6 +2228,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} +--- !u!4 &1165092670169827401 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 1745768441} + m_PrefabAsset: {fileID: 0} --- !u!4 &1165092670169827399 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092669499377598, guid: 4c8639a41d5af934d933d50f22d40218, @@ -2264,12 +2264,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} ---- !u!4 &1165092670169827401 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 1745768441} - m_PrefabAsset: {fileID: 0} --- !u!224 &7128533549541609610 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, @@ -2282,6 +2276,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1745768441} m_PrefabAsset: {fileID: 0} +--- !u!4 &1271572592464149430 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 1745768441} + m_PrefabAsset: {fileID: 0} --- !u!4 &1165092670169827407 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092669499377590, guid: 4c8639a41d5af934d933d50f22d40218,