From a2172c2f0a342ab6a84e5e494e51192302d0d794 Mon Sep 17 00:00:00 2001 From: "DESKTOP-MMO982B\\User" <752966621@qq.com> Date: Wed, 28 Aug 2024 12:02:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ng_zh.png => lingshou_chuzhanjiacheng.png} | Bin .../lingshou_chuzhanjiacheng_zh.png.meta | 110 ---- ..._zh.png => lingshou_fangshenglingshou.png} | Bin .../lingshou_fangshenglingshou_zh.png.meta | 110 ---- ...bao_zh.png => lingshou_lingshouliebao.png} | Bin .../lingshou_lingshouliebao_zh.png.meta | 110 ---- ..._zh.png => lingshou_lingshoushangdian.png} | Bin .../lingshou_lingshoushangdian_zh.png.meta | 110 ---- ...nanniu_zh.png => lingshou_niepananniu.png} | Bin .../ArtFont/lingshou_niepananniu_zh.png.meta | 110 ---- ...nanniu_zh.png => lingshou_rihuananniu.png} | Bin .../ArtFont/lingshou_rihuananniu_zh.png.meta | 110 ---- ...xianniu_zh.png => lingshou_xiuxianniu.png} | Bin .../ArtFont/lingshou_xiuxianniu_zh.png.meta | 110 ---- ...houzhai_zh.png => lingshou_yushouzhai.png} | Bin .../ArtFont/lingshou_yushouzhai_zh.png.meta | 110 ---- ...anniu_zh.png => t_tianshumijuan_anniu.png} | Bin .../ArtFont/t_tianshumijuan_anniu_zh.png.meta | 110 ---- .../UI/GeneralPanel/GeneralBigPopup.prefab | 36 +- .../UI/GodWeapon/GodWeaponMainPanel.prefab | 10 +- .../HandBookHeroAndEquipListPanel.prefab | 558 +++++++++--------- .../~Lua/Common/functions.lua | 2 +- .../Modules/Formation/FormationPanelV2.lua | 2 +- .../Modules/Likability/LikeAbilityPanel.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleListPanel.lua | 2 +- 25 files changed, 309 insertions(+), 1293 deletions(-) rename Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/{lingshou_chuzhanjiacheng_zh.png => lingshou_chuzhanjiacheng.png} (100%) delete mode 100644 Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_chuzhanjiacheng_zh.png.meta rename Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/{lingshou_fangshenglingshou_zh.png => lingshou_fangshenglingshou.png} (100%) delete mode 100644 Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_fangshenglingshou_zh.png.meta rename Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/{lingshou_lingshouliebao_zh.png => lingshou_lingshouliebao.png} (100%) delete mode 100644 Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshouliebao_zh.png.meta rename Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/{lingshou_lingshoushangdian_zh.png => lingshou_lingshoushangdian.png} (100%) delete mode 100644 Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshoushangdian_zh.png.meta rename Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/{lingshou_niepananniu_zh.png => lingshou_niepananniu.png} (100%) delete mode 100644 Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_niepananniu_zh.png.meta rename Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/{lingshou_rihuananniu_zh.png => lingshou_rihuananniu.png} (100%) delete mode 100644 Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_rihuananniu_zh.png.meta rename Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/{lingshou_xiuxianniu_zh.png => lingshou_xiuxianniu.png} (100%) delete mode 100644 Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_xiuxianniu_zh.png.meta rename Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/{lingshou_yushouzhai_zh.png => lingshou_yushouzhai.png} (100%) delete mode 100644 Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_yushouzhai_zh.png.meta rename Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/{t_tianshumijuan_anniu_zh.png => t_tianshumijuan_anniu.png} (100%) delete mode 100644 Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/t_tianshumijuan_anniu_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_chuzhanjiacheng_zh.png b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_chuzhanjiacheng.png similarity index 100% rename from Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_chuzhanjiacheng_zh.png rename to Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_chuzhanjiacheng.png diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_chuzhanjiacheng_zh.png.meta b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_chuzhanjiacheng_zh.png.meta deleted file mode 100644 index 601c01ad8a..0000000000 --- a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_chuzhanjiacheng_zh.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: f0de7ddc70356c74b8db78080881765a -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 86141f36cf5965a4891f6d3b5b991f02 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: PokemonAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_fangshenglingshou_zh.png b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_fangshenglingshou.png similarity index 100% rename from Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_fangshenglingshou_zh.png rename to Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_fangshenglingshou.png diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_fangshenglingshou_zh.png.meta b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_fangshenglingshou_zh.png.meta deleted file mode 100644 index 79915e7efb..0000000000 --- a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_fangshenglingshou_zh.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 5bae755f0b5908245acb028ea5276fa4 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: a6a8dd7081631154fbb0f8cd669e15a1 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: PokemonAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshouliebao_zh.png b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshouliebao.png similarity index 100% rename from Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshouliebao_zh.png rename to Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshouliebao.png diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshouliebao_zh.png.meta b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshouliebao_zh.png.meta deleted file mode 100644 index 8b44b80376..0000000000 --- a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshouliebao_zh.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 6906151886fd6ab44980e3ada9bfdf96 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: fe65305f0869bc94a9f0cb1b8435094f - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: PokemonAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshoushangdian_zh.png b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshoushangdian.png similarity index 100% rename from Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshoushangdian_zh.png rename to Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshoushangdian.png diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshoushangdian_zh.png.meta b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshoushangdian_zh.png.meta deleted file mode 100644 index e97268a884..0000000000 --- a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_lingshoushangdian_zh.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 61ac9e8973629544bb01c438e3bc05bd -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 692e059a69973314a9cc0df101ae9459 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: PokemonAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_niepananniu_zh.png b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_niepananniu.png similarity index 100% rename from Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_niepananniu_zh.png rename to Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_niepananniu.png diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_niepananniu_zh.png.meta b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_niepananniu_zh.png.meta deleted file mode 100644 index 99daaa4c0d..0000000000 --- a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_niepananniu_zh.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 5d5b170ddf0c8474ba8f28857d07ebc0 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: afd79a4dfdc2da2408afc66433b03321 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: PokemonAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_rihuananniu_zh.png b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_rihuananniu.png similarity index 100% rename from Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_rihuananniu_zh.png rename to Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_rihuananniu.png diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_rihuananniu_zh.png.meta b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_rihuananniu_zh.png.meta deleted file mode 100644 index fdaf238aec..0000000000 --- a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_rihuananniu_zh.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 67e72377fd55cdb41aad3feaaede0572 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 3c3443ee9c9175b428db050ff817b02e - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: PokemonAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_xiuxianniu_zh.png b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_xiuxianniu.png similarity index 100% rename from Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_xiuxianniu_zh.png rename to Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_xiuxianniu.png diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_xiuxianniu_zh.png.meta b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_xiuxianniu_zh.png.meta deleted file mode 100644 index d28f50d790..0000000000 --- a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_xiuxianniu_zh.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 784672908efe10948b4b0f65b54d2790 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 1716ceb5beec9c643af3136643edc873 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: PokemonAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_yushouzhai_zh.png b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_yushouzhai.png similarity index 100% rename from Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_yushouzhai_zh.png rename to Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_yushouzhai.png diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_yushouzhai_zh.png.meta b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_yushouzhai_zh.png.meta deleted file mode 100644 index 1b8e008169..0000000000 --- a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/lingshou_yushouzhai_zh.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 1a3bbd686b2f5e94ea2567c98c508569 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: e4f1e3d0d3a26004b88ead1e11ee0e3c - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: PokemonAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/t_tianshumijuan_anniu_zh.png b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/t_tianshumijuan_anniu.png similarity index 100% rename from Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/t_tianshumijuan_anniu_zh.png rename to Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/t_tianshumijuan_anniu.png diff --git a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/t_tianshumijuan_anniu_zh.png.meta b/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/t_tianshumijuan_anniu_zh.png.meta deleted file mode 100644 index a0162f4141..0000000000 --- a/Assets/ManagedResources/Atlas/PokemonAtlas/ArtFont/t_tianshumijuan_anniu_zh.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: c1d9856fac061e246846928a7e696ac3 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 428ea103b3cd38d48b803e9026f2f3b0 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: PokemonAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 6f05cba3fe..0eb7bb6269 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -147,7 +147,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: 47ce9b27346f39f45b705e95eb3984a7, type: 3} + m_Sprite: {fileID: 21300000, guid: a5a2927be5cddde4aa8573cc79c1bf16, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3759,10 +3759,10 @@ RectTransform: m_Father: {fileID: 104785466952913777} m_RootOrder: 4 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 760, y: -120} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2980853436230393831 CanvasRenderer: @@ -7189,10 +7189,10 @@ RectTransform: m_Father: {fileID: 104785466952913777} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100, y: -120} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4329534855784721111 CanvasRenderer: @@ -8273,7 +8273,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7653855264894605139 RectTransform: m_ObjectHideFlags: 0 @@ -31207,10 +31207,10 @@ RectTransform: m_Father: {fileID: 104785466952913777} m_RootOrder: 3 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -120} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5416947283401139823 CanvasRenderer: @@ -32462,10 +32462,10 @@ RectTransform: m_Father: {fileID: 104785466952913777} m_RootOrder: 2 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -120} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1075456802991939877 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponMainPanel.prefab index 46077e6876..ab289b6351 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponMainPanel.prefab @@ -7297,7 +7297,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: 6906151886fd6ab44980e3ada9bfdf96, type: 3} + m_Sprite: {fileID: 21300000, guid: aceb13d6618cdd5499bee60464426724, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -49081,7 +49081,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0.000061035156, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2, y: 802} m_Pivot: {x: 0, y: 0} --- !u!114 &4621404858944286041 @@ -51569,7 +51569,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: c1d9856fac061e246846928a7e696ac3, type: 3} + m_Sprite: {fileID: 21300000, guid: 92925ff58a230354a815a54eab1ac17c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -59729,7 +59729,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: 5bae755f0b5908245acb028ea5276fa4, type: 3} + m_Sprite: {fileID: 21300000, guid: aceb13d6618cdd5499bee60464426724, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -60714,7 +60714,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: f0de7ddc70356c74b8db78080881765a, type: 3} + m_Sprite: {fileID: 21300000, guid: 92925ff58a230354a815a54eab1ac17c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab index e4c42a596d..aa10d53b41 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab @@ -935,7 +935,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: 394.95, y: 0} m_SizeDelta: {x: 715.9, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4678132937042676580 @@ -8258,7 +8258,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: 37, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1480407683763232224 @@ -12846,7 +12846,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: b1894c27fafe6d54fa31df687a95eca9, type: 3} + m_Sprite: {fileID: 21300000, guid: a5a2927be5cddde4aa8573cc79c1bf16, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -13297,6 +13297,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2029504947455733146} m_Modifications: + - target: {fileID: 3679604669199410926, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_Name + value: card2 + objectReference: {fileID: 0} - target: {fileID: 3461300678615895712, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_LocalPosition.x @@ -13412,21 +13417,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.9 objectReference: {fileID: 0} - - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_SizeDelta.x - value: 126.7 - objectReference: {fileID: 0} - - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_SizeDelta.y - value: 48.7 - objectReference: {fileID: 0} - - target: {fileID: 3679604669199410926, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_Name - value: card2 - objectReference: {fileID: 0} - target: {fileID: 3639078397396446894, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: tweenSequeue.Array.data[0].targetObj @@ -13442,6 +13432,16 @@ PrefabInstance: propertyPath: tweenSequeue.Array.data[2].targetObj value: objectReference: {fileID: 4083321445754421357} + - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.x + value: 126.7 + objectReference: {fileID: 0} + - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.y + value: 48.7 + objectReference: {fileID: 0} - target: {fileID: 3290621036918302228, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_TargetGraphic @@ -13804,6 +13804,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2029504947455733146} m_Modifications: + - target: {fileID: 3679604669199410926, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_Name + value: card3 + objectReference: {fileID: 0} - target: {fileID: 3461300678615895712, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_LocalPosition.x @@ -13919,21 +13924,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.9 objectReference: {fileID: 0} - - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_SizeDelta.x - value: 126.7 - objectReference: {fileID: 0} - - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_SizeDelta.y - value: 48.7 - objectReference: {fileID: 0} - - target: {fileID: 3679604669199410926, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_Name - value: card3 - objectReference: {fileID: 0} - target: {fileID: 3639078397396446894, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: tweenSequeue.Array.data[0].targetObj @@ -13949,6 +13939,16 @@ PrefabInstance: propertyPath: tweenSequeue.Array.data[2].targetObj value: objectReference: {fileID: 641729436672662630} + - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.x + value: 126.7 + objectReference: {fileID: 0} + - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.y + value: 48.7 + objectReference: {fileID: 0} - target: {fileID: 3290621036918302228, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_TargetGraphic @@ -14311,6 +14311,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2029504947455733146} m_Modifications: + - target: {fileID: 3679604669199410926, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_Name + value: card4 + objectReference: {fileID: 0} - target: {fileID: 3461300678615895712, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_LocalPosition.x @@ -14426,21 +14431,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.9 objectReference: {fileID: 0} - - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_SizeDelta.x - value: 126.7 - objectReference: {fileID: 0} - - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_SizeDelta.y - value: 48.7 - objectReference: {fileID: 0} - - target: {fileID: 3679604669199410926, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_Name - value: card4 - objectReference: {fileID: 0} - target: {fileID: 3639078397396446894, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: tweenSequeue.Array.data[0].targetObj @@ -14456,6 +14446,16 @@ PrefabInstance: propertyPath: tweenSequeue.Array.data[2].targetObj value: objectReference: {fileID: 507059649001875988} + - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.x + value: 126.7 + objectReference: {fileID: 0} + - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.y + value: 48.7 + objectReference: {fileID: 0} - target: {fileID: 3290621036918302228, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_TargetGraphic @@ -14818,6 +14818,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2029504947455733146} m_Modifications: + - target: {fileID: 3679604669199410926, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_Name + value: card5 + objectReference: {fileID: 0} - target: {fileID: 3461300678615895712, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_LocalPosition.x @@ -14933,21 +14938,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.9 objectReference: {fileID: 0} - - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_SizeDelta.x - value: 126.7 - objectReference: {fileID: 0} - - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_SizeDelta.y - value: 48.7 - objectReference: {fileID: 0} - - target: {fileID: 3679604669199410926, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_Name - value: card5 - objectReference: {fileID: 0} - target: {fileID: 3639078397396446894, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: tweenSequeue.Array.data[0].targetObj @@ -14963,11 +14953,27 @@ PrefabInstance: propertyPath: tweenSequeue.Array.data[2].targetObj value: objectReference: {fileID: 1421303986566688526} + - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.x + value: 126.7 + objectReference: {fileID: 0} + - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.y + value: 48.7 + objectReference: {fileID: 0} - target: {fileID: 3290621036918302228, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_TargetGraphic value: objectReference: {fileID: 1239225577160268054} + - target: {fileID: 3290544168943665750, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a5a2927be5cddde4aa8573cc79c1bf16, + type: 3} - target: {fileID: 1165092670158494079, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_Bones.Array.data[0] @@ -15325,6 +15331,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2029504947455733146} m_Modifications: + - target: {fileID: 3679604669199410926, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_Name + value: card1 + objectReference: {fileID: 0} - target: {fileID: 3461300678615895712, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_LocalPosition.x @@ -15440,26 +15451,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.9 objectReference: {fileID: 0} - - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 51.735 - objectReference: {fileID: 0} - - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_SizeDelta.x - value: 126.6 - objectReference: {fileID: 0} - - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_SizeDelta.y - value: 48.7 - objectReference: {fileID: 0} - - target: {fileID: 3679604669199410926, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - propertyPath: m_Name - value: card1 - objectReference: {fileID: 0} - target: {fileID: 3639078397396446894, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: tweenSequeue.Array.data[0].targetObj @@ -15475,6 +15466,21 @@ PrefabInstance: propertyPath: tweenSequeue.Array.data[2].targetObj value: objectReference: {fileID: 6953889317893958501} + - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 51.735 + objectReference: {fileID: 0} + - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.x + value: 126.6 + objectReference: {fileID: 0} + - target: {fileID: 3461656373541963414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.y + value: 48.7 + objectReference: {fileID: 0} - target: {fileID: 3290621036918302228, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_TargetGraphic @@ -15837,6 +15843,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4092950273976144604} m_Modifications: + - target: {fileID: 1627229493224811649, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_Name + value: starGrid(Clone) + objectReference: {fileID: 0} - target: {fileID: 1552766642506092791, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_LocalPosition.x @@ -16002,26 +16013,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -44.71 objectReference: {fileID: 0} - - target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 74.875 - objectReference: {fileID: 0} - - target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -44.71 - objectReference: {fileID: 0} - target: {fileID: 1527732943800344204, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y @@ -16042,6 +16033,56 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -11 objectReference: {fileID: 0} + - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 149.5 + objectReference: {fileID: 0} + - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -25 + objectReference: {fileID: 0} + - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_SizeDelta.x + value: 71 + objectReference: {fileID: 0} + - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_SizeDelta.y + value: 71 + objectReference: {fileID: 0} + - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 191.54 + objectReference: {fileID: 0} + - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -21.5 + objectReference: {fileID: 0} - target: {fileID: 1552672424429218327, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y @@ -16112,56 +16153,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -21.5 objectReference: {fileID: 0} - - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchoredPosition.x - value: 92.5 + value: 35.5 objectReference: {fileID: 0} - - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: -44.71 objectReference: {fileID: 0} - - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_SizeDelta.x value: 71 objectReference: {fileID: 0} - - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_SizeDelta.y value: 71 objectReference: {fileID: 0} - - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 369.91998 - objectReference: {fileID: 0} - - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -11 - objectReference: {fileID: 0} - target: {fileID: 1553117905214590869, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y @@ -16222,145 +16243,75 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 71 objectReference: {fileID: 0} - - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchoredPosition.x - value: 35.5 + value: 369.91998 objectReference: {fileID: 0} - - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553085882533151289, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchoredPosition.y - value: -44.71 + value: -11 objectReference: {fileID: 0} - - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_SizeDelta.x - value: 71 - objectReference: {fileID: 0} - - target: {fileID: 1553157242851919857, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_SizeDelta.y - value: 71 - objectReference: {fileID: 0} - - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchoredPosition.x - value: 191.54 + value: 92.5 objectReference: {fileID: 0} - - target: {fileID: 1553325678886575579, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -21.5 - objectReference: {fileID: 0} - - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 149.5 - objectReference: {fileID: 0} - - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchoredPosition.y value: -25 objectReference: {fileID: 0} - - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_SizeDelta.x value: 71 objectReference: {fileID: 0} - - target: {fileID: 1553449319409733029, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1553056371136533881, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_SizeDelta.y value: 71 objectReference: {fileID: 0} - - target: {fileID: 1626374441078482171, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_AnchorMin.y + value: 1 objectReference: {fileID: 0} - - target: {fileID: 1626450299968751741, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_AnchorMax.y + value: 1 objectReference: {fileID: 0} - - target: {fileID: 1627007613516185809, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_AnchoredPosition.x + value: 74.875 objectReference: {fileID: 0} - - target: {fileID: 1627016296001056047, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 1397539620555614202, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1627087403431368471, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1627229493224811649, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_Name - value: starGrid(Clone) - objectReference: {fileID: 0} - - target: {fileID: 1627294551272884993, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1627430950262272671, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1627785274346046325, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1627917913997089859, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1659186882582842753, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_ChildAlignment - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1659186882582842753, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_Spacing - value: -14 + propertyPath: m_AnchoredPosition.y + value: -44.71 objectReference: {fileID: 0} - target: {fileID: 1747052073296031067, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} @@ -16382,11 +16333,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -11 objectReference: {fileID: 0} - - target: {fileID: 2200092791510044952, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2782265686221494692, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y @@ -16407,26 +16353,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -21.5 objectReference: {fileID: 0} - - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 96.625 - objectReference: {fileID: 0} - - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -44.71 - objectReference: {fileID: 0} - target: {fileID: 3861968913902194252, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y @@ -16447,35 +16373,25 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -44.71 objectReference: {fileID: 0} - - target: {fileID: 4019731748636677328, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4041547246533256848, guid: 36dd48caaba02124b8d95a5eddd29b90, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchoredPosition.x - value: 553.57996 + value: 96.625 objectReference: {fileID: 0} - - target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 3460032746863086171, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_AnchoredPosition.y - value: -11 + value: -44.71 objectReference: {fileID: 0} - target: {fileID: 4921417269786883892, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} @@ -16517,20 +16433,25 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -21.5 objectReference: {fileID: 0} - - target: {fileID: 5251871090314339625, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_AnchorMin.y + value: 1 objectReference: {fileID: 0} - - target: {fileID: 5477929200912148599, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_AnchorMax.y + value: 1 objectReference: {fileID: 0} - - target: {fileID: 5589626010518342017, guid: 36dd48caaba02124b8d95a5eddd29b90, + - target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} - propertyPath: m_IsActive - value: 0 + propertyPath: m_AnchoredPosition.x + value: 553.57996 + objectReference: {fileID: 0} + - target: {fileID: 4832637171196072171, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -11 objectReference: {fileID: 0} - target: {fileID: 7153922244736782079, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} @@ -16552,6 +16473,91 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -11 objectReference: {fileID: 0} + - target: {fileID: 1659186882582842753, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_ChildAlignment + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1659186882582842753, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_Spacing + value: -14 + objectReference: {fileID: 0} + - target: {fileID: 1626450299968751741, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1626374441078482171, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1627785274346046325, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1627917913997089859, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1627007613516185809, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1627016296001056047, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1627087403431368471, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1627294551272884993, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1627430950262272671, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2200092791510044952, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4019731748636677328, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4041547246533256848, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5589626010518342017, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5477929200912148599, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5251871090314339625, guid: 36dd48caaba02124b8d95a5eddd29b90, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7369835203180901237, guid: 36dd48caaba02124b8d95a5eddd29b90, type: 3} propertyPath: m_IsActive diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 1e95038216..2ab2cac219 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1655,7 +1655,7 @@ function GetProStrImageByProNum(_index) elseif _index == 4 then return "r_hero_dadi 1_zh" elseif _index == 5 then - return "z_icon_qingjinbao" + return "r_hero_sk 1_zh" elseif _index == 6 then return "z_icon_qingjinbao" else diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 098bcb8325..a4060988b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -39,7 +39,7 @@ local tempPowerNum=0 --临时战力 local panelType local parameter --透传参数 -local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh","z_icon_qingjinbao"} +local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh","r_hero_sk 1_zh"} local isPress = false -- 各个类型编队系统逻辑列表 this.PanelOptionView = { diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua index fa0ad57278..8f3f8c84cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua @@ -11,7 +11,7 @@ local pos = { } local sortOrder = 0 local tabs = {} -local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh","z_icon_qingjinbao"} +local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh","r_hero_sk 1_zh"} local proId = 0 local heroData = {} function LikeAbilityPanel:InitComponent() diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index 1c93105499..23c2827f0f 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -8,7 +8,7 @@ local teamHero = {} local roleDatas={} this.isFirstOpen=true local tabs = {} -local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh","z_icon_qingjinbao"} +local tabsImg = {"z_icon_01_zh", "r_hero_huo 1_zh", "r_hero_feng 1_zh", "r_hero_shui 1_zh", "r_hero_dadi 1_zh","r_hero_sk 1_zh"} local soulPrintData={} local orginLayer = 0 local orginLayer2 = 0