diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_59.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_59.png new file mode 100644 index 0000000000..c35e4984cb Binary files /dev/null and b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_59.png differ diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_59.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_59.png.meta new file mode 100644 index 0000000000..8a4cd26b76 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_59.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 9868ce5b89ba4da42a34c2740bebbc16 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: f1d3c9b9db2353d4fa6e7b290b60a299 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_60.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_60.png new file mode 100644 index 0000000000..3dd89125e6 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_60.png differ diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_60.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_60.png.meta new file mode 100644 index 0000000000..f403fe3904 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_60.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 65596e86ff3f2ac4d9702317077b47ef +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2ff716d30e078034aaa030fd2b7e2f74 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_61.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_61.png new file mode 100644 index 0000000000..4bf468fa8b Binary files /dev/null and b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_61.png differ diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_61.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_61.png.meta new file mode 100644 index 0000000000..f0d39058d8 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_61.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 60241a605a527b34f9abd16c86f686fa +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: d0590446b338ad84f92e6f87c8a9f8d4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_62.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_62.png new file mode 100644 index 0000000000..ed03ffef16 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_62.png differ diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_62.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_62.png.meta new file mode 100644 index 0000000000..78f950ae01 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_62.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 4459d957aca1989469ce2dae2656ecdf +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 006c881f96cc7af4d8942e373a6fa8fd + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_63.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_63.png new file mode 100644 index 0000000000..f7d63ecb47 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_63.png differ diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_63.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_63.png.meta new file mode 100644 index 0000000000..3c6c186283 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_63.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: b3244247ab6a37742af7b6a9536e283e +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 06951414dd58890439e851a832a613de + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_64.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_64.png new file mode 100644 index 0000000000..4de9efd9a0 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_64.png differ diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_64.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_64.png.meta new file mode 100644 index 0000000000..ecd57d5135 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_64.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 28a73e0fef870834aa3d93ab6d1f0ad9 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2d41c7ab02fbed74880c0774103a97a0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_65.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_65.png new file mode 100644 index 0000000000..70fa6060fe Binary files /dev/null and b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_65.png differ diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_65.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_65.png.meta new file mode 100644 index 0000000000..622094c7e2 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe05_65.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 4264aa81c218a494abae5f8511f5827b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5ec7d108c1645f44381e3917e2f7ca39 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/Practice.meta b/Assets/ManagedResources/BG/UI/Practice.meta new file mode 100644 index 0000000000..39730be3fd --- /dev/null +++ b/Assets/ManagedResources/BG/UI/Practice.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36717280ec1e68f4ca306534a9a2fd27 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab index 3d3b237426..fb8fad059d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab @@ -111,7 +111,7 @@ RectTransform: 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: 164, y: 161} + m_SizeDelta: {x: 153, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &277511216 CanvasRenderer: @@ -141,7 +141,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: d2b396d7634707b4a91d9eea6b6450f1, type: 3} + m_Sprite: {fileID: 21300000, guid: 60241a605a527b34f9abd16c86f686fa, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -186,7 +186,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -71} + m_AnchoredPosition: {x: 8.6, y: -44.2} m_SizeDelta: {x: 188.9, y: 69.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &291297155 @@ -219,10 +219,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -297,7 +297,7 @@ RectTransform: 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: 166, y: 182} + m_SizeDelta: {x: 153, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &361431217 CanvasRenderer: @@ -327,7 +327,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: 916e7c2c09a2ad7498bb027780a8b302, type: 3} + m_Sprite: {fileID: 21300000, guid: 65596e86ff3f2ac4d9702317077b47ef, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -405,10 +405,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -483,7 +483,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 153, y: 154} + m_SizeDelta: {x: 153, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &423729231 CanvasRenderer: @@ -513,7 +513,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: d413e387932e7e24dbf684b374b0ffc2, type: 3} + m_Sprite: {fileID: 21300000, guid: 60241a605a527b34f9abd16c86f686fa, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -558,7 +558,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -71} + m_AnchoredPosition: {x: 0, y: -27} m_SizeDelta: {x: 188.9, y: 69.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &499673079 @@ -591,10 +591,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -633,6 +633,117 @@ MonoBehaviour: m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &609941905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 609941906} + - component: {fileID: 609941910} + - component: {fileID: 609941909} + - component: {fileID: 609941908} + - component: {fileID: 609941907} + m_Layer: 0 + m_Name: LevelTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &609941906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 609941905} + 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: 561283881550327309} + 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: 5, y: 34} + m_SizeDelta: {x: 343.37, y: 127.8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &609941910 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 609941905} + m_CullTransparentMesh: 0 +--- !u!114 &609941909 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 609941905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9960785, g: 0.93725497, b: 0.93725497, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 90 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u70BC\u6C14\u671F" +--- !u!114 &609941908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 609941905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.06666667, g: 0.10196079, b: 0.1764706, a: 1} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!114 &609941907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 609941905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.039215688, g: 0.34509805, b: 0.7725491, a: 1} + m_EffectDistance: {x: 3, y: -3} + m_UseGraphicAlpha: 1 --- !u!1 &632600025 GameObject: m_ObjectHideFlags: 0 @@ -669,7 +780,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -71} + m_AnchoredPosition: {x: 0, y: -27.000008} m_SizeDelta: {x: 188.9, y: 69.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &632600028 @@ -702,10 +813,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -855,7 +966,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -71} + m_AnchoredPosition: {x: 0, y: -27.000008} m_SizeDelta: {x: 188.9, y: 69.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1009943095 @@ -888,10 +999,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -966,7 +1077,7 @@ RectTransform: 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: 164, y: 161} + m_SizeDelta: {x: 153, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1096292253 CanvasRenderer: @@ -996,7 +1107,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: d2b396d7634707b4a91d9eea6b6450f1, type: 3} + m_Sprite: {fileID: 21300000, guid: 9868ce5b89ba4da42a34c2740bebbc16, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1040,8 +1151,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 157, y: 167} + m_AnchoredPosition: {x: -7.9, y: 0} + m_SizeDelta: {x: 153, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1191879177 CanvasRenderer: @@ -1071,7 +1182,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: d8d956a61db04dc4cab9b6627b1da59a, type: 3} + m_Sprite: {fileID: 21300000, guid: 28a73e0fef870834aa3d93ab6d1f0ad9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1116,7 +1227,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -71} + m_AnchoredPosition: {x: 0, y: -41} m_SizeDelta: {x: 188.9, y: 69.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1364560902 @@ -1149,10 +1260,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1191,6 +1302,80 @@ MonoBehaviour: m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &1897905905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1897905906} + - component: {fileID: 1897905908} + - component: {fileID: 1897905907} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1897905906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897905905} + 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: 8503549196898394800} + 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: 1081, y: 1922} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1897905908 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897905905} + m_CullTransparentMesh: 0 +--- !u!114 &1897905907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897905905} + 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.40392157} + 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: 638359ecbe3da1644bd1b38bd9eb720e, 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 &1972142677 GameObject: m_ObjectHideFlags: 0 @@ -1227,7 +1412,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -71} + m_AnchoredPosition: {x: 0, y: -41} m_SizeDelta: {x: 188.9, y: 69.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1972142680 @@ -1338,7 +1523,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -71} + m_AnchoredPosition: {x: 0, y: -41} m_SizeDelta: {x: 188.9, y: 69.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2035081598 @@ -1371,10 +1556,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1448,8 +1633,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 174} + m_AnchoredPosition: {x: 1.9, y: -13.1} + m_SizeDelta: {x: 153, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2080249165 CanvasRenderer: @@ -1479,7 +1664,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: 46b29b96572f04d4095fa54da3ac87e5, type: 3} + m_Sprite: {fileID: 21300000, guid: 4264aa81c218a494abae5f8511f5827b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6391,7 +6576,7 @@ GameObject: - component: {fileID: 7222135203639326882} - component: {fileID: 2683641090515334356} m_Layer: 5 - m_Name: yushenBtn + m_Name: imprintBtn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6416,7 +6601,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 174} + m_SizeDelta: {x: 142, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4655910079569053905 CanvasRenderer: @@ -11516,8 +11701,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -118, y: -199} - m_SizeDelta: {x: 236, y: 84} + m_AnchoredPosition: {x: -124.20001, y: -199} + m_SizeDelta: {x: 233.5, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4570418038677911438 CanvasRenderer: @@ -11547,7 +11732,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: ec4564e2f8fecab459f4154631a2d29c, type: 3} + m_Sprite: {fileID: 21300000, guid: 934f215d095d3ee45913a1a02fabe1e1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16789,7 +16974,7 @@ RectTransform: 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: 68, y: 68} + m_SizeDelta: {x: 50, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8158193788146855441 CanvasRenderer: @@ -33281,7 +33466,7 @@ RectTransform: 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: 180, y: 174} + m_SizeDelta: {x: 127, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7879764501367644930 CanvasRenderer: @@ -33331,6 +33516,7 @@ GameObject: - component: {fileID: 958979315939946074} - component: {fileID: 5540117317491000185} - component: {fileID: 714424866611409976} + - component: {fileID: 1965109852} m_Layer: 0 m_Name: LevelTxt m_TagString: Untagged @@ -33354,7 +33540,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -226} + m_AnchoredPosition: {x: 0, y: -233} m_SizeDelta: {x: 299, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5540117317491000185 @@ -33378,7 +33564,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9215687, g: 0.8352942, b: 0.7490196, a: 1} + m_Color: {r: 0.94117653, g: 0.91372555, b: 0.5803922, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -33387,7 +33573,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 45 + m_FontSize: 42 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -33399,6 +33585,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u2014\u7EC3\u6C14\u524D\u2014" +--- !u!114 &1965109852 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4436637314212902419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &4454891382382535469 GameObject: m_ObjectHideFlags: 0 @@ -38382,7 +38583,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.000029802322, y: -64} + m_AnchoredPosition: {x: 8.6, y: -28.6} m_SizeDelta: {x: 188.9, y: 69.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4387058446480186159 @@ -38415,10 +38616,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -39100,7 +39301,8 @@ RectTransform: 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_Children: + - {fileID: 609941906} m_Father: {fileID: 8126515032001170632} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -39124,7 +39326,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5369329383939908763} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -39270,6 +39472,7 @@ GameObject: - component: {fileID: 2537661423143505680} - component: {fileID: 8886805999110388681} - component: {fileID: 6038232723979374349} + - component: {fileID: 953724525} m_Layer: 0 m_Name: starNum m_TagString: Untagged @@ -39317,7 +39520,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9843138, g: 0.854902, b: 0.45098042, a: 1} + m_Color: {r: 0.98823535, g: 0.98823535, b: 0.97647065, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -39326,7 +39529,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 64 + m_FontSize: 42 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -39339,6 +39542,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 999 LanguageIndex: 0 +--- !u!114 &953724525 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5563641139663571394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.10980393, g: 0.03137255, b: 0.043137256, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5581247262164033322 GameObject: m_ObjectHideFlags: 0 @@ -39522,7 +39740,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -73.1, y: 1.9} - m_SizeDelta: {x: 72, y: 70} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4824392986643678705 CanvasRenderer: @@ -39746,7 +39964,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.000029802322, y: -65.099945} + m_AnchoredPosition: {x: -0.000029802322, y: -23.2} m_SizeDelta: {x: 188.9, y: 69.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7828079501435289383 @@ -39779,10 +39997,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 @@ -39860,7 +40078,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 174} + m_SizeDelta: {x: 142, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &872264181117903381 CanvasRenderer: @@ -39974,7 +40192,7 @@ GameObject: - component: {fileID: 5308729347115026364} - component: {fileID: 7369784760968303520} m_Layer: 5 - m_Name: imprintBtn + m_Name: yushenBtn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -39999,7 +40217,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 174} + m_SizeDelta: {x: 142, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5983553501615161877 CanvasRenderer: @@ -40134,8 +40352,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 174} + m_AnchoredPosition: {x: -10.7, y: -7.2} + m_SizeDelta: {x: 153, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6193497848613254314 CanvasRenderer: @@ -40165,7 +40383,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: 50a3c2870b789f141979beed0823abb8, type: 3} + m_Sprite: {fileID: 21300000, guid: b3244247ab6a37742af7b6a9536e283e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -40490,7 +40708,7 @@ RectTransform: 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: -171.5, y: -360} + m_AnchoredPosition: {x: -184, y: -333} m_SizeDelta: {x: 129.5, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &1358751446755459863 @@ -60729,7 +60947,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 187.2, y: 184.6} + m_SizeDelta: {x: 142, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4606777694015441894 CanvasRenderer: @@ -61069,8 +61287,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -100, y: -300} - m_SizeDelta: {x: 110, y: 110} + m_AnchoredPosition: {x: -100, y: -323} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1051757220321499835 CanvasRenderer: @@ -65964,7 +66182,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 174} + m_SizeDelta: {x: 142, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3304734437331651406 CanvasRenderer: @@ -71410,6 +71628,7 @@ RectTransform: - {fileID: 5860093666912857526} - {fileID: 4618111448975546095} - {fileID: 446848837023256862} + - {fileID: 1897905906} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -72181,7 +72400,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 127, y: 135} + m_SizeDelta: {x: 142, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2371125510953333917 CanvasRenderer: @@ -77107,8 +77326,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 183, y: 181} + m_AnchoredPosition: {x: 0, y: -13.8} + m_SizeDelta: {x: 153, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5014750745919327311 CanvasRenderer: @@ -77138,7 +77357,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: 70dd9afd8bd4dfb4d970a00a40239b60, type: 3} + m_Sprite: {fileID: 21300000, guid: 4459d957aca1989469ce2dae2656ecdf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua index 84b224df12..6bcb0d1825 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua @@ -90,9 +90,9 @@ function this:OnOpen(_fightData, _endFunc, guideType) fightType = BATTLE_TYPE.Test --判定战斗类型 if _fightData.bg then - this.BG:GetComponent("Image").sprite = this.spLoader:LoadSprite(_fightData.bg) + this.LiveBg=poolManager:LoadLive(_fightData.bg, this.BG.transform, Vector3.New(1.5,1.5,1.5), Vector3.zero) else - this.BG:GetComponent("Image").sprite = this.spLoader:LoadSprite(BattleManager.GetBattleBg(fightType)) + this.LiveBg=poolManager:LoadLive(BattleManager.GetBattleBg(fightType), this.BG.transform, Vector3.New(1.5,1.5,1.5), Vector3.zero) end this.BtnGM:SetActive(guideType ~= 3) diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 71480b8660..6827ff33a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -52,6 +52,7 @@ function Practice:InitComponent() --MidPart self.mid = Util.GetGameObject(self.gameObject, "Mid") self.levelName = Util.GetGameObject(self.mid, "LevelName"):GetComponent("Image") + self.levelText = Util.GetGameObject(self.mid, "LevelTxt"):GetComponent("Text") self.levelTxt = Util.GetGameObject(self.mid, "LevelTxt"):GetComponent("Text") self.img = Util.GetGameObject(self.mid, "Man"):GetComponent("Image") self.ManCanvas = Util.GetGameObject(self.mid, "Man"):GetComponent("Canvas") @@ -387,6 +388,7 @@ end function Practice:RefreshMid() self.levelName.sprite = self.spLoader:LoadSprite(self.curLevelConfig.NamePic1) + self.levelText.text = self.curLevelConfig.Name self.levelTxt.text="-"..self.curLevelConfig.Name.."-" self.starNum.text = PracticeManager.StarNum local playerImg = NameManager.roleSex == 0 and "x_xiuxing_liangongren_nan" or "x_xiuxing_liangongren_nv" diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index e664560ce5..7ba387b261 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -164,8 +164,8 @@ function RecruitPanelNew:OnShow(sortingOrder) end if self.config.ShopData[2][1] == 1 then local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig,self.config.ShopData[2][2]) - local name = GetResourcePath(heroConfig.Live) - self.liveNode = poolManager:LoadLive(name, self.root.transform, Vector3.one *0.5, Vector3.New(heroConfig.Position[1], heroConfig.Position[2], 0)) + local name = GetResourcePath(heroConfig.Painting) + self.liveNode = poolManager:LoadLive(name, self.root.transform, Vector3.one *0.5, Vector3.New(heroConfig.Position[1], heroConfig.Position[2]-500, 0)) self.liveNode.name = name SetHEeroLiveToward(self.liveNode,heroConfig.Toward) local SkeletonGraphic = self.liveNode:GetComponent("SkeletonGraphic")