diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_fuzhubiao_1.png b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_fuzhubiao_1.png new file mode 100644 index 0000000000..07f286f5c2 Binary files /dev/null and b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_fuzhubiao_1.png differ diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_fuzhubiao_1.png.meta b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_fuzhubiao_1.png.meta new file mode 100644 index 0000000000..2427fc9191 --- /dev/null +++ b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_fuzhubiao_1.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 317c7c8b2f89123499c3aebddf08c8d0 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b572151249cd74e44ad8a94a16f48869 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: GodSoulAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_konghzibiao_1.png b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_konghzibiao_1.png new file mode 100644 index 0000000000..df09e49599 Binary files /dev/null and b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_konghzibiao_1.png differ diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_konghzibiao_1.png.meta b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_konghzibiao_1.png.meta new file mode 100644 index 0000000000..f3c5b43d8b --- /dev/null +++ b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_konghzibiao_1.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 89497e59daa8c10408d172b0617f0954 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 171825c6e1c3f314a89b3a88ccbb7543 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: GodSoulAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_roudunbiao_1.png b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_roudunbiao_1.png new file mode 100644 index 0000000000..0f52d7da50 Binary files /dev/null and b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_roudunbiao_1.png differ diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_roudunbiao_1.png.meta b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_roudunbiao_1.png.meta new file mode 100644 index 0000000000..8f621e5242 --- /dev/null +++ b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_roudunbiao_1.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 905bfb42a51a40143b1988275f778291 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0addb4dac05a0fd49a22673cda9f3429 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: GodSoulAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_shuchubiao_1.png b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_shuchubiao_1.png new file mode 100644 index 0000000000..826670c0db Binary files /dev/null and b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_shuchubiao_1.png differ diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_shuchubiao_1.png.meta b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_shuchubiao_1.png.meta new file mode 100644 index 0000000000..07ee596ae3 --- /dev/null +++ b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_hero_shuchubiao_1.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 3699719397546f944afc8e0cb60762d4 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 7dfb6e3bcf3772f44ab3a99e8ca78fa3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: GodSoulAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/r_tongyong_zhuanshiliujiaoxin_1.png b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_tongyong_zhuanshiliujiaoxin_1.png new file mode 100644 index 0000000000..b92ee079e4 Binary files /dev/null and b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_tongyong_zhuanshiliujiaoxin_1.png differ diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/r_tongyong_zhuanshiliujiaoxin_1.png.meta b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_tongyong_zhuanshiliujiaoxin_1.png.meta new file mode 100644 index 0000000000..16d6c52457 --- /dev/null +++ b/Assets/ManagedResources/Atlas/GodSoulAtlas/r_tongyong_zhuanshiliujiaoxin_1.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 1115791f8fabc674c8c56f8c3069418f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 88f84263ff816db4093c4f90b0d14dca + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: GodSoulAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/t_zhandoukuang_zhuangshi006.png b/Assets/ManagedResources/Atlas/GodSoulAtlas/t_zhandoukuang_zhuangshi006.png new file mode 100644 index 0000000000..488ce83629 Binary files /dev/null and b/Assets/ManagedResources/Atlas/GodSoulAtlas/t_zhandoukuang_zhuangshi006.png differ diff --git a/Assets/ManagedResources/Atlas/GodSoulAtlas/t_zhandoukuang_zhuangshi006.png.meta b/Assets/ManagedResources/Atlas/GodSoulAtlas/t_zhandoukuang_zhuangshi006.png.meta new file mode 100644 index 0000000000..0ebbe604b0 --- /dev/null +++ b/Assets/ManagedResources/Atlas/GodSoulAtlas/t_zhandoukuang_zhuangshi006.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 86c28761cd5902f40b85baef2be42119 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 445230bc82c80d24888a68727dfdcb49 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: GodSoulAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResUI/RoleInfo/Animation/s_shenhunxitong_huoyan_03.controller b/Assets/ManagedResources/EffectResUI/RoleInfo/Animation/s_shenhunxitong_huoyan_anim.controller similarity index 98% rename from Assets/ManagedResources/EffectResUI/RoleInfo/Animation/s_shenhunxitong_huoyan_03.controller rename to Assets/ManagedResources/EffectResUI/RoleInfo/Animation/s_shenhunxitong_huoyan_anim.controller index ac81cf5938..8c84069776 100644 --- a/Assets/ManagedResources/EffectResUI/RoleInfo/Animation/s_shenhunxitong_huoyan_03.controller +++ b/Assets/ManagedResources/EffectResUI/RoleInfo/Animation/s_shenhunxitong_huoyan_anim.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: s_shenhunxitong_huoyan_03 + m_Name: s_shenhunxitong_huoyan_anim serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/EffectResUI/RoleInfo/Animation/s_shenhunxitong_huoyan_03.controller.meta b/Assets/ManagedResources/EffectResUI/RoleInfo/Animation/s_shenhunxitong_huoyan_anim.controller.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/RoleInfo/Animation/s_shenhunxitong_huoyan_03.controller.meta rename to Assets/ManagedResources/EffectResUI/RoleInfo/Animation/s_shenhunxitong_huoyan_anim.controller.meta diff --git a/Assets/ManagedResources/Icon/Item/icon_sbx.png.meta b/Assets/ManagedResources/Icon/Item/icon_sbx.png.meta new file mode 100644 index 0000000000..2e2ee81027 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/icon_sbx.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 41086d221f703934392bec2f4fd4c0fc +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: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0b1451b48dd4fc24a9e17cb19ac32b0e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + 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 07f9f7acd8..066af00a10 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -2932,6 +2932,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6BCF\u8F6E\u53EF\u62BC\u6CE82\u628A\u5251\uFF08\u7ADE\u731C\u5931\u8D25\u8FD4\u8FD8\u5168\u90E8\u5FA1\u5251\u4EE4\uFF09" LanguageIndex: 0 +--- !u!1 &228977158610072764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6369299264874410666} + - component: {fileID: 2022575713563462133} + - component: {fileID: 4778247834376717613} + m_Layer: 5 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6369299264874410666 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228977158610072764} + 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: 7330183250426436879} + 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: -4.700012, y: 0} + m_SizeDelta: {x: 197.07, y: 47.75} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2022575713563462133 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228977158610072764} + m_CullTransparentMesh: 0 +--- !u!114 &4778247834376717613 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228977158610072764} + 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.85490197, g: 0.5882353, b: 0.28235295, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 70 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u795E\u5E94\u5C5E\u6027" + LanguageIndex: 11580 --- !u!1 &229268780954427967 GameObject: m_ObjectHideFlags: 0 @@ -4980,7 +5060,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1048101660349373980 RectTransform: m_ObjectHideFlags: 0 @@ -5596,6 +5676,55 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8BBE \u7F6E" LanguageIndex: 11266 +--- !u!1 &1189814832643173648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2663529563725567141} + - component: {fileID: 4378255385568622220} + m_Layer: 5 + m_Name: GeneralBigPopup_ShenhunDes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2663529563725567141 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189814832643173648} + 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: 8562449111802739555} + - {fileID: 4990853717574928614} + - {fileID: 1575591700325158924} + - {fileID: 6792850820011299652} + - {fileID: 4526275225150643432} + m_Father: {fileID: 2423465471356683207} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4378255385568622220 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189814832643173648} + m_CullTransparentMesh: 0 --- !u!1 &1220464110280881561 GameObject: m_ObjectHideFlags: 0 @@ -5740,6 +5869,123 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 0 +--- !u!1 &1220698795944081131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8562449111802739555} + - component: {fileID: 6963778830480412504} + - component: {fileID: 3938389851981717786} + - component: {fileID: 8250684691803863358} + m_Layer: 5 + m_Name: close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8562449111802739555 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1220698795944081131} + 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: 2663529563725567141} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6963778830480412504 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1220698795944081131} + m_CullTransparentMesh: 0 +--- !u!114 &3938389851981717786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1220698795944081131} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + 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: 0} + 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!114 &8250684691803863358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1220698795944081131} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3938389851981717786} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &1274461216656815567 GameObject: m_ObjectHideFlags: 0 @@ -7056,6 +7302,119 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1586824361686787802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6792850820011299652} + - component: {fileID: 1352619706088265658} + - component: {fileID: 4435748249170381499} + - component: {fileID: 5450960263748550281} + - component: {fileID: 8470808013051733283} + m_Layer: 5 + m_Name: proGroup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6792850820011299652 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586824361686787802} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 200} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2663529563725567141} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: -616.96985} + m_SizeDelta: {x: 692.1, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &1352619706088265658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586824361686787802} + m_CullTransparentMesh: 0 +--- !u!114 &4435748249170381499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586824361686787802} + 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: 0, g: 0, b: 0, a: 0.23529412} + m_RaycastTarget: 0 + 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: 0} + 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!114 &5450960263748550281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586824361686787802} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &8470808013051733283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586824361686787802} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 30 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 --- !u!1 &1593504276384976856 GameObject: m_ObjectHideFlags: 0 @@ -7256,6 +7615,119 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1613870877718836234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4526275225150643432} + - component: {fileID: 4476788870308905042} + - component: {fileID: 1583342820586662617} + - component: {fileID: 3717760619404489502} + - component: {fileID: 2965139972957694717} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4526275225150643432 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613870877718836234} + 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: 2663529563725567141} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 692.1, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4476788870308905042 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613870877718836234} + m_CullTransparentMesh: 0 +--- !u!114 &1583342820586662617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613870877718836234} + 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: 58c503111f310224a9a04ab39a004308, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &3717760619404489502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613870877718836234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 30 + m_Bottom: 30 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &2965139972957694717 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613870877718836234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &1614925683994287435 GameObject: m_ObjectHideFlags: 0 @@ -13911,6 +14383,91 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &4865208311421858864 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1575591700325158924} + - component: {fileID: 6684030729584612398} + - component: {fileID: 166182147328807367} + - component: {fileID: 2221407639558312976} + m_Layer: 5 + m_Name: pro + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1575591700325158924 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4865208311421858864} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 200} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6529135272273757954} + - {fileID: 2553460339116818527} + m_Father: {fileID: 2663529563725567141} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -525.96985} + m_SizeDelta: {x: 637.89, y: 152} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6684030729584612398 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4865208311421858864} + m_CullTransparentMesh: 0 +--- !u!114 &166182147328807367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4865208311421858864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &2221407639558312976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4865208311421858864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 --- !u!1 &4885797416583119490 GameObject: m_ObjectHideFlags: 0 @@ -14067,6 +14624,101 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4895935414560688659} m_CullTransparentMesh: 0 +--- !u!1 &4929580650494798401 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2553460339116818527} + - component: {fileID: 4784652651521644947} + - component: {fileID: 6741982932981710740} + - component: {fileID: 4327925756718231320} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2553460339116818527 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4929580650494798401} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.016036987} + m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799} + m_Children: [] + m_Father: {fileID: 1575591700325158924} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -13.9} + m_SizeDelta: {x: 637.89, y: 2} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &4784652651521644947 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4929580650494798401} + m_CullTransparentMesh: 0 +--- !u!114 &6741982932981710740 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4929580650494798401} + 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: 36e05fe912e1e9e47aef85f30fd11d93, 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!114 &4327925756718231320 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4929580650494798401} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &4948414332922323475 GameObject: m_ObjectHideFlags: 0 @@ -19350,6 +20002,81 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u4E00\u952E\u653E\u5165" +--- !u!1 &6799565945016984959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7330183250426436879} + - component: {fileID: 8594286176808754702} + - component: {fileID: 9017306315105271397} + m_Layer: 5 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7330183250426436879 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6799565945016984959} + 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: 6369299264874410666} + m_Father: {fileID: 4990853717574928614} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 400, y: -32.04} + m_SizeDelta: {x: 280.5, y: 64.08} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8594286176808754702 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6799565945016984959} + m_CullTransparentMesh: 0 +--- !u!114 &9017306315105271397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6799565945016984959} + 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: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6823618120496866411 GameObject: m_ObjectHideFlags: 0 @@ -19738,6 +20465,7 @@ RectTransform: - {fileID: 2234119587365347983} - {fileID: 7830425952965198751} - {fileID: 1625255851888925010} + - {fileID: 2663529563725567141} m_Father: {fileID: 1047325092235970838} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -21806,6 +22534,90 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u62BD\u52305\u661F\u795E\u5C06\u65F6\uFF0C\u670940%\u51E0\u7387\u8F6C\u5316\u4E3A\u5FC3\u613F\u795E\u5C06\uFF01" LanguageIndex: 0 +--- !u!1 &7716133679934060224 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4990853717574928614} + - component: {fileID: 3591956821481912709} + - component: {fileID: 7437773830983361127} + - component: {fileID: 1269913308383178737} + m_Layer: 5 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4990853717574928614 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716133679934060224} + 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: 7330183250426436879} + m_Father: {fileID: 2663529563725567141} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -434.96985} + m_SizeDelta: {x: 692.1, y: 64.08} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3591956821481912709 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716133679934060224} + m_CullTransparentMesh: 0 +--- !u!114 &7437773830983361127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716133679934060224} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &1269913308383178737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716133679934060224} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &7728715910403479568 GameObject: m_ObjectHideFlags: 0 @@ -24387,6 +25199,101 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8818604070651818485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6529135272273757954} + - component: {fileID: 416051916177105773} + - component: {fileID: 6239026256074010159} + - component: {fileID: 5691885185799408296} + m_Layer: 0 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6529135272273757954 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818604070651818485} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -200} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1575591700325158924} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 400, y: 0} + m_SizeDelta: {x: 637.89, y: 152} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &416051916177105773 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818604070651818485} + m_CullTransparentMesh: 0 +--- !u!114 &6239026256074010159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818604070651818485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1.3 + m_Text: + LanguageIndex: 0 +--- !u!114 &5691885185799408296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818604070651818485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &8850405255913382704 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab b/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab index b885145f96..36dcc847df 100644 --- a/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab @@ -3421,10 +3421,10 @@ RectTransform: m_Father: {fileID: 6546751699367335720} 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: 0, y: -3.47} - m_SizeDelta: {x: 14.97, y: 37.42} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -6.6999893, y: 0} + m_SizeDelta: {x: 0.6000004, y: -0.40000153} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &5312127279028889697 Animator: @@ -3517,8 +3517,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 28.167496, y: -6.7535} - m_SizeDelta: {x: 32.493, y: 32.493} + m_AnchoredPosition: {x: 54.649994, y: 4.5} + m_SizeDelta: {x: 21.9, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &1204521523941111826 CanvasRenderer: @@ -3671,8 +3671,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 89.6465, y: -6.7535} - m_SizeDelta: {x: 32.493, y: 32.493} + m_AnchoredPosition: {x: 84.35, y: 4.5} + m_SizeDelta: {x: 21.9, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &6538529404677289810 CanvasRenderer: @@ -3826,8 +3826,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 110.139496, y: -6.7535} - m_SizeDelta: {x: 32.493, y: 32.493} + m_AnchoredPosition: {x: 94.25, y: 4.5} + m_SizeDelta: {x: 21.9, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &3792623521938868203 CanvasRenderer: @@ -3901,8 +3901,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 48.660496, y: -6.7535} - m_SizeDelta: {x: 32.493, y: 32.493} + m_AnchoredPosition: {x: 64.549995, y: 4.5} + m_SizeDelta: {x: 21.9, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &8223094582038930833 CanvasRenderer: @@ -4343,10 +4343,10 @@ RectTransform: m_Father: {fileID: 8137459246776515621} 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: 0, y: 5.5} - m_SizeDelta: {x: 14.97, y: 37.42} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -12, y: 0} + m_SizeDelta: {x: 0.6000004, y: -0.40000153} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &4767970594039775338 Animator: @@ -4437,10 +4437,10 @@ RectTransform: m_Father: {fileID: 2327268691548940647} 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: 0, y: 5.5} - m_SizeDelta: {x: 14.97, y: 37.42} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 9.20001, y: 0} + m_SizeDelta: {x: 0.6000004, y: -0.40000153} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &5016058081671698437 Animator: @@ -4533,8 +4533,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 69.153496, y: -6.7535} - m_SizeDelta: {x: 32.493, y: 32.493} + m_AnchoredPosition: {x: 74.45, y: 4.5} + m_SizeDelta: {x: 21.9, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &6397862130251614174 CanvasRenderer: @@ -4680,10 +4680,10 @@ RectTransform: m_Father: {fileID: 1133333780268927848} 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: 0, y: -11.5} - m_SizeDelta: {x: 14.97, y: 37.42} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -1.3999901, y: 0} + m_SizeDelta: {x: 0.6000004, y: -0.40000153} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &2250874285369845401 Animator: @@ -4848,10 +4848,10 @@ RectTransform: m_Father: {fileID: 8833848101918479878} 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: 0, y: -3.47} - m_SizeDelta: {x: 14.97, y: 37.42} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 3.900013, y: 0} + m_SizeDelta: {x: 0.6000004, y: -0.40000153} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &8669997763344014173 Animator: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab index d94cef6969..93d8ad3971 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab @@ -8195,7 +8195,6 @@ RectTransform: - {fileID: 6329356416232525112} - {fileID: 7380528184849112542} - {fileID: 1845128006530525653} - - {fileID: 8076280276223622894} - {fileID: 7909267848903592036} m_Father: {fileID: 3721606396940629678} m_RootOrder: 3 @@ -8226,7 +8225,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 10 + m_Left: -41 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -9047,7 +9046,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 122.29, y: 0.000005722} - m_SizeDelta: {x: 68, y: 68} + m_SizeDelta: {x: 55, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &205763726446674324 CanvasRenderer: @@ -9467,100 +9466,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3112886630456234083 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9090731781994421865} - - component: {fileID: 2643394529277697711} - - component: {fileID: 1620492080116998790} - - component: {fileID: 5876625701258289352} - m_Layer: 0 - m_Name: godItem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9090731781994421865 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3112886630456234083} - 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: 8076280276223622894} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000034332275, y: 19.2} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!95 &2643394529277697711 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3112886630456234083} - m_Enabled: 0 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: fc664216adddae14a9f0c535de68ce27, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!222 &1620492080116998790 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3112886630456234083} - m_CullTransparentMesh: 0 ---- !u!114 &5876625701258289352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3112886630456234083} - 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: b8edce2c7e5337742b17f23e6207f305, 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 &3176735535217670954 GameObject: m_ObjectHideFlags: 0 @@ -11450,51 +11355,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4461755839127568994 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8076280276223622894} - - component: {fileID: 7888936504104502380} - m_Layer: 5 - m_Name: shenhunPre6 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8076280276223622894 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4461755839127568994} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.90157604, y: 0.90157604, z: 1} - m_Children: - - {fileID: 9090731781994421865} - m_Father: {fileID: 7865542922754469003} - m_RootOrder: 6 - 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: 40, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7888936504104502380 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4461755839127568994} - m_CullTransparentMesh: 0 --- !u!1 &4503173981061481418 GameObject: m_ObjectHideFlags: 0 @@ -21902,12 +21762,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7865542922754469003} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 460.89996, y: -28.5} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 413, y: -28.5} + m_SizeDelta: {x: 55, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4345334337068021407 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab index 6ce17d428d..546220ecdb 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab @@ -34,7 +34,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: 8, y: 0} + m_AnchoredPosition: {x: 36, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2138797110120768411 @@ -107,8 +107,8 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000030114341} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0.000066322995} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &3981280066466389833 @@ -130,9 +130,9 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 - m_ChildForceExpandWidth: 0 + m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 + m_ChildControlWidth: 1 m_ChildControlHeight: 1 --- !u!114 &3814224098974134678 MonoBehaviour: @@ -344,11 +344,11 @@ RectTransform: m_Father: {fileID: 4597121384872724610} 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: 0, y: 54} - m_SizeDelta: {x: 1080, y: 550} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 30.32} + m_SizeDelta: {x: 0, y: 550} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &7266364021255335440 CanvasRenderer: m_ObjectHideFlags: 0 @@ -419,7 +419,7 @@ RectTransform: - {fileID: 5958479553850673959} - {fileID: 7195213204864936634} m_Father: {fileID: 7083992215520858126} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -439,7 +439,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 8 + m_Left: 36 m_Right: 0 m_Top: 22 m_Bottom: 0 @@ -496,10 +496,10 @@ RectTransform: m_Father: {fileID: 1192127436118750043} 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} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 404.7} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -275} + m_SizeDelta: {x: 0, y: 404.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6127808348039670114 MonoBehaviour: @@ -579,7 +579,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: 98.33, y: 0} + m_AnchoredPosition: {x: 126.33, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &7791366892849227651 @@ -727,8 +727,8 @@ RectTransform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -845,6 +845,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 8052061722645042747} - {fileID: 394706968880482131} - {fileID: 1451547768145439107} - {fileID: 7026640070725781074} @@ -1388,11 +1389,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7083992215520858126} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -98, y: 0.000011444} + m_AnchoredPosition: {x: -98, y: 0.000011444092} m_SizeDelta: {x: 67, y: 68} m_Pivot: {x: 1, y: 0.5} --- !u!222 &6907097536520889140 @@ -1526,7 +1527,7 @@ RectTransform: m_Children: - {fileID: 5983196808726496618} m_Father: {fileID: 7083992215520858126} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1554,7 +1555,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 18 + m_Left: 36 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -1674,3 +1675,98 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &8687395626654813007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8052061722645042747} + - component: {fileID: 1868048285248541893} + - component: {fileID: 4322266999811635557} + - component: {fileID: 6924885176568475866} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8052061722645042747 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687395626654813007} + 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: 7083992215520858126} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1868048285248541893 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687395626654813007} + m_CullTransparentMesh: 0 +--- !u!114 &4322266999811635557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687395626654813007} + 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: 5eb7fbeffdba3c448a555d0a7da444cf, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &6924885176568475866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687395626654813007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/starGridView/starGrid.prefab b/Assets/ManagedResources/Prefabs/UI/starGridView/starGrid.prefab index c2bddeb237..0b856e28c2 100644 --- a/Assets/ManagedResources/Prefabs/UI/starGridView/starGrid.prefab +++ b/Assets/ManagedResources/Prefabs/UI/starGridView/starGrid.prefab @@ -2008,7 +2008,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.125, y: 1.67} + m_AnchoredPosition: {x: -0.125, y: 5.4799995} m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &2655531992509407668 @@ -2102,7 +2102,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.125, y: 1.67} + m_AnchoredPosition: {x: -0.125, y: 5.4799995} m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &4642416904858124546 @@ -2270,7 +2270,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.125, y: 1.67} + m_AnchoredPosition: {x: -0.125, y: 5.4799995} m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &4787264721783863393 @@ -3052,7 +3052,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.125, y: 1.67} + m_AnchoredPosition: {x: -0.125, y: 5.4799995} m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &4874594261059891495 @@ -3146,7 +3146,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.125, y: 1.67} + m_AnchoredPosition: {x: -0.125, y: 5.4799995} m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &745703553484805016 @@ -3315,7 +3315,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.125, y: 1.67} + m_AnchoredPosition: {x: -0.125, y: 5.4799995} m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &5179213922337160743 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index a45ee0256f..8b0190f985 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2262,6 +2262,8 @@ GENERAL_POPUP_TYPE={ ShenHun = 53, YuJianLastResult = 51, --御剑行上轮奖励 YuJianBet = 52, --御剑行竞猜 + + ShenHunShuXing = 54, } --通用信息弹窗类型 @@ -2982,14 +2984,14 @@ GodSoulProfession = { [3] = "s_shenhunxitong_zhiyexiaobiao_03", [4] = "s_shenhunxitong_zhiyexiaobiao_04", }, - [10] = {[1] = "r_hero_roudunbiao", - [2] = "r_hero_shuchubiao", - [3] = "r_hero_konghzibiao", - [4] = "r_hero_fuzhubiao", + [10] = {[1] = "r_hero_roudunbiao_1", + [2] = "r_hero_shuchubiao_1", + [3] = "r_hero_konghzibiao_1", + [4] = "r_hero_fuzhubiao_1", } } StarImage = { - [10] = "t_zhandoukuang_zhuangshixx_png", - [11] = "r_tongyong_zhuanshiliujiaoxin", + [10] = "s_shenhunxitong_hong", + [11] = "s_shenhunxitong_zuanshitouxiangkuang", } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 62077840dc..1609a3c8d3 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -550,6 +550,10 @@ local star2index = { [5] = {1, 2, 3, 4, 5} } function SetCardStars(starGrid, star,starType) + local starScale = -12 + if starType == 3 then + starScale = -0.4 + end for i = 1, 21 do starGrid.transform:GetChild(i - 1).gameObject:SetActive(false) end @@ -573,6 +577,8 @@ function SetCardStars(starGrid, star,starType) Util.GetGameObject(starGrid.transform:GetChild(star),"star").gameObject:SetActive(false) end end + starGrid:GetComponent("LayoutGroup").spacing = starScale + ForceRebuildLayout(starGrid.transform) end -- 在给定节点下加载预设, 返回实例化的预设 function newObjToParent(prefab, parent) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index de9c72ed67..917d6c8dd5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -526,6 +526,9 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) local star,starType = heroData.GetStar() + if starType == 3 then + fg.sprite = this.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006") + end SetCardStars(starGrid,star,starType) if heroData.star > 9 then Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua index e20e55895b..247aa00b7b 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua @@ -34,6 +34,7 @@ local contentScripts = { [GENERAL_POPUP_TYPE.YuJianLastResult] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult"), panelName = "GeneralBigPopup_YuJianLastResult"}, --御剑行上轮奖励 [GENERAL_POPUP_TYPE.YuJianBet] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_YuJianBet"), panelName = "GeneralBigPopup_YuJianBet"}, + [GENERAL_POPUP_TYPE.ShenHunShuXing] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_ShenhunDes"), panelName = "GeneralBigPopup_ShenhunDes"}, } --子模块预设 local contentPrefabs={} diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenhunDes.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenhunDes.lua new file mode 100644 index 0000000000..6998665880 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenhunDes.lua @@ -0,0 +1,87 @@ +----- 神应属性弹窗 ----- +local this = {} +local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) +--传入父脚本模块 +local parent +local sortingOrder=0 +local attriList = {} + +function this:InitComponent(gameObject) + self.bg =Util.GetGameObject(gameObject, "bg") + self.proGroup =Util.GetGameObject(gameObject, "proGroup") + self.proTitle =Util.GetGameObject(gameObject, "title") + self.proValue =Util.GetGameObject(gameObject, "pro") + self.close =Util.GetGameObject(gameObject, "close") +end + +function this:BindEvent() + Util.AddClick(self.close,function() + parent:ClosePanel() + end) +end + +function this:AddListener() +end + +function this:RemoveListener() +end + +function this:OnShow(_parent,_Data) + parent=_parent + sortingOrder = _parent.sortingOrder + parent.BG:SetActive(false) + local args = _Data + local data = args[1] + for i = 1, #data do + if not attriList[i] then + attriList[i] = {} + attriList[i].proGroup = newObjToParent(self.proGroup,self.bg) + end + attriList[i].proGroup.gameObject:SetActive(false) + if not attriList[i].title then + attriList[i].title = newObjToParent(self.proTitle,attriList[i].proGroup) + attriList[i].titleCom = Util.GetGameObject(attriList[i].title,"name/text"):GetComponent("Text") + end + attriList[i].title.gameObject:SetActive(false) + for j = 1, #data[i].pro do + if not attriList[i].pro then + attriList[i].pro = {} + end + if not attriList[i].TextCom then + attriList[i].TextCom = {} + end + if not attriList[i].pro[j] then + attriList[i].pro[j] = newObjToParent(self.proValue,attriList[i].proGroup) + attriList[i].TextCom[j] = Util.GetGameObject(attriList[i].pro[j],"name"):GetComponent("Text") + end + attriList[i].pro[j].gameObject:SetActive(false) + end + attriList[i].proGroup.gameObject:SetActive(false) + end + + for i = 1, #data do + attriList[i].proGroup.gameObject:SetActive(true) + if data[i].title and data[i].title ~= "" then + attriList[i].title.gameObject:SetActive(true) + attriList[i].titleCom.text = data[i].title + else + attriList[i].title.gameObject:SetActive(false) + end + for j = 1, #data[i].pro do + attriList[i].pro[j].gameObject:SetActive(true) + attriList[i].TextCom[j].text = data[i].pro[j] + end + end +end + +function this:OnClose() + Util.ClearChild(self.bg.transform) + attriList = {} +end + +function this:OnDestroy() + Util.ClearChild(self.bg.transform) + attriList = {} +end + +return this diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenhunDes.lua.meta b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenhunDes.lua.meta new file mode 100644 index 0000000000..768dad0f30 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenhunDes.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 783d3511217ae5f45a2c41a7890c8bf8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index ec51678b54..a4b393bdf4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -77,13 +77,14 @@ function RoleInfoPopup:InitComponent() this.shenhunList = {} this.shenhunRoot = Util.GetGameObject(this.roleInfo1,"shenhun") - for i = 1,6 do + for i = 1,5 do if not this.shenhunList[i] then this.shenhunList[i] = {} end this.shenhunList[i].go = Util.GetGameObject(this.shenhunRoot, "shenhunPre"..i) LogGreen("this.shenhunList[i].go:"..tostring(this.shenhunList[i].go.name)) this.shenhunList[i].goItem = Util.GetGameObject(this.shenhunList[i].go, "godItem"):GetComponent("Animator") + LogGreen("this.shenhunList[i].goItem.gameObject.name:"..tostring(this.shenhunList[i].goItem.gameObject.name)) end this.ShenhunBtn = Util.GetGameObject(this.shenhunRoot,"ShenhunBtn") end @@ -95,12 +96,13 @@ function RoleInfoPopup:BindEvent() local pro = {} local lv = GodSoulManager.GetGodSoulLv(curHeroData.dynamicId) local skillList = GodSoulManager.GetGodSoulDataByLv(curHeroData.heroConfig.Id,0) - local color = "000000" - for i = 1,6 do + + for i = 1,LengthOfTable(skillList) do + local color = "B9AC97" if lv >= i then - color = "FF0000" + color = "00FF00" end - table.insert(pro,string.format("%s",color,skillList[i].skill)) + table.insert(pro,string.format("神魂%s:%s",color,i,skillList[i].skill)) end return pro end @@ -109,7 +111,7 @@ function RoleInfoPopup:BindEvent() singData.title = "神魂效果" singData.pro = s() table.insert(data,singData) - UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.WuJinShuXing,data) + UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ShenHunShuXing,data) end) Util.AddClick(this.talentBtn,function() UIManager.OpenPanel(UIName.RoleTalentPopup,curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) @@ -215,6 +217,7 @@ function RoleInfoPopup:OnDestroy() this.pinjieList={} soulPrintPreList={} orginLayer2=0 + this.shenhunList = {} orginLayer=0 end @@ -283,10 +286,10 @@ function this.RoleInfo1() for i = 1,#this.shenhunList do if i > star then Util.SetGray(this.shenhunList[i].go,true) - this.shenhunList[i].godItem.enabled = false + this.shenhunList[i].goItem.enabled = false else Util.SetGray(this.shenhunList[i].go,false) - this.shenhunList[i].godItem.enabled = true + this.shenhunList[i].goItem.enabled = true end end else diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGodSoulLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGodSoulLayout.lua index e8608c0e2d..285f97a0e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGodSoulLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGodSoulLayout.lua @@ -145,13 +145,13 @@ function RoleGodSoulLayout:UpdataSingleGod(index) end end end - self.gridList[index].des.text = string.format("%s",self.godDatas[index].skill) --神魂效果 绿色 未激活时置灰 + if not self.addShow then self.gridList[index].tip.text = "需要:" --未解锁红色 self.gridList[index].costGrid.gameObject:SetActive(true) self.gridList[index].add.gameObject:SetActive(false) Util.SetGray(self.gridList[index].godGrid,false) - Util.SetGray(self.gridList[index].des.gameObject,false) + --Util.SetGray(self.gridList[index].des.gameObject,false) self.gridList[index].des.text = string.format("%s",self.godDatas[index].skill) --神魂效果 绿色 未激活时置灰 elseif index <= self.lv + 1 then self.gridList[index].tip.text = "需要:" --未解锁红色 @@ -159,10 +159,12 @@ function RoleGodSoulLayout:UpdataSingleGod(index) self.gridList[index].add.gameObject:SetActive(true) if index == self.lv + 1 then Util.SetGray(self.gridList[index].godGrid,true) --勾魂图标 未激活时置灰 - Util.SetGray(self.gridList[index].des.gameObject,true) + --Util.SetGray(self.gridList[index].des.gameObject,true) + self.gridList[index].des.text = string.format("%s",self.godDatas[index].skill) --神魂效果 绿色 未激活时置灰 else Util.SetGray(self.gridList[index].godGrid,false) - Util.SetGray(self.gridList[index].des.gameObject,false) + --Util.SetGray(self.gridList[index].des.gameObject,false) + self.gridList[index].des.text = string.format("%s",self.godDatas[index].skill) --神魂效果 绿色 未激活时置灰 end else self.gridList[index].costGrid.gameObject:SetActive(false) @@ -170,7 +172,8 @@ function RoleGodSoulLayout:UpdataSingleGod(index) --红色 self.gridList[index].tip.text = string.format("激活%s级神魂后解锁:",index - 1) Util.SetGray(self.gridList[index].godGrid,true) - Util.SetGray(self.gridList[index].des.gameObject,true) + --Util.SetGray(self.gridList[index].des.gameObject,true) + self.gridList[index].des.text = string.format("%s",self.godDatas[index].skill) --神魂效果 绿色 未激活时置灰 end Util.AddOnceClick(self.gridList[index].add,function()