diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/PuTong/v01/Card_Ui_ Leixing Fanwei_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/PuTong/v01/Card_Ui_ Leixing Fanwei_v01.png.meta index 0448cc06..d39331df 100644 --- a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/PuTong/v01/Card_Ui_ Leixing Fanwei_v01.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/PuTong/v01/Card_Ui_ Leixing Fanwei_v01.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -125,7 +125,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting.meta new file mode 100644 index 00000000..cd4aaa04 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7bfbf35746818de4b9e24832f6bced4b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/LiTu.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/LiTu.png new file mode 100644 index 00000000..caf93ac9 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/LiTu.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/LiTu.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/LiTu.png.meta new file mode 100644 index 00000000..778e6e1d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/LiTu.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 2659581f2c0ce4b4f83895faa48737e5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_AnJianKuang_v01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_AnJianKuang_v01.png new file mode 100644 index 00000000..1a2fecf8 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_AnJianKuang_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_AnJianKuang_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_AnJianKuang_v01.png.meta new file mode 100644 index 00000000..f2d92f62 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_AnJianKuang_v01.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: de8e54fdb68f4864c80bebb0c8079497 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Sslx_Ui_SheZhi_AnJianKuang_v01_0 + rect: + serializedVersion: 2 + x: 83 + y: 98 + width: 691 + height: 158 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 55, y: 18, z: 60, w: 18} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ea14586c94668bf48bd0b677b9a2546b + internalID: 2137927476 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 7301192ddf1fbdd498147562cff1d14d + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sslx_Ui_SheZhi_AnJianKuang_v01_0: 2137927476 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_BiaoTi_v01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_BiaoTi_v01.png new file mode 100644 index 00000000..f515ad30 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_BiaoTi_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_BiaoTi_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_BiaoTi_v01.png.meta new file mode 100644 index 00000000..7b209790 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_BiaoTi_v01.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 8dd42b56a643d5444987e0f9ee5b5d94 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Sslx_Ui_SheZhi_BiaoTi_v01_0 + rect: + serializedVersion: 2 + x: 83 + y: 16 + width: 805 + height: 349 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a1403bf47d629fb43a943d55ada8042e + internalID: -1094772320 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0b3bbcc2e41401149b10eecf600bb68a + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sslx_Ui_SheZhi_BiaoTi_v01_0: -1094772320 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DiBan_v01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DiBan_v01.png new file mode 100644 index 00000000..38c1826b Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DiBan_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DiBan_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DiBan_v01.png.meta new file mode 100644 index 00000000..68a4bc5d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DiBan_v01.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 89d2e111086186d45a91e52bfb95775f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Sslx_Ui_SheZhi_DiBan_v01_0 + rect: + serializedVersion: 2 + x: 196 + y: 196 + width: 997 + height: 1413 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 024005c2dd5d0f44198055262e4866bc + internalID: -395849654 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8bb4c74d741fd7c4099929ccfe182e1a + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sslx_Ui_SheZhi_DiBan_v01_0: -395849654 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGouKuang_v01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGouKuang_v01.png new file mode 100644 index 00000000..cc3041c1 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGouKuang_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGouKuang_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGouKuang_v01.png.meta new file mode 100644 index 00000000..3b639fce --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGouKuang_v01.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 3763e79e519b4744e8498cf3e15281ab +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 1000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Sslx_Ui_SheZhi_DuiGouKuang_v01_0 + rect: + serializedVersion: 2 + x: 155 + y: 137 + width: 370 + height: 317 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 52, y: 45, z: 59, w: 52} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 528febffba3f0174f9bb056e2fc61b90 + internalID: 1267110475 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5d5e455f91b797447830764bc30b595d + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sslx_Ui_SheZhi_DuiGouKuang_v01_0: 1267110475 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGoui_v01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGoui_v01.png new file mode 100644 index 00000000..e46991ab Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGoui_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGoui_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGoui_v01.png.meta new file mode 100644 index 00000000..21953eb7 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGoui_v01.png.meta @@ -0,0 +1,150 @@ +fileFormatVersion: 2 +guid: ace3021fc09b4a84991c5535361f7305 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Sslx_Ui_SheZhi_DuiGoui_v01_0 + rect: + serializedVersion: 2 + x: 309 + y: 190 + width: 719 + height: 618 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8c084b171e218ad4b8e9351b817320f2 + internalID: 735299134 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 876d5d81d3a53754f8bfa84eaae34ab8 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sslx_Ui_SheZhi_DuiGoui_v01_0: 735299134 + Sslx_Ui_SheZhi_DuiGoui_v01_1: 2119581007 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_XuanXiangKuang_v01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_XuanXiangKuang_v01.png new file mode 100644 index 00000000..5bfe7def Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_XuanXiangKuang_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_XuanXiangKuang_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_XuanXiangKuang_v01.png.meta new file mode 100644 index 00000000..a2ba2abd --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_XuanXiangKuang_v01.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 2086866033a1171448dc9261291aafa8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Sslx_Ui_SheZhi_XuanXiangKuang_v01_0 + rect: + serializedVersion: 2 + x: 177 + y: 167 + width: 1418 + height: 308 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 61b902b5a4d87c741a434b262e36ef5e + internalID: 1694164675 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a2bc9f16a6eb7864481f268404f6b713 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sslx_Ui_SheZhi_XuanXiangKuang_v01_0: 1694164675 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_YinLiangAnJian_v01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_YinLiangAnJian_v01.png new file mode 100644 index 00000000..2d82169f Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_YinLiangAnJian_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_YinLiangAnJian_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_YinLiangAnJian_v01.png.meta new file mode 100644 index 00000000..d55117f9 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_YinLiangAnJian_v01.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 08760973ab9c0e444976b3acf82d4b5b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 1000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Sslx_Ui_SheZhi_YinLiangAnJian_v01_0 + rect: + serializedVersion: 2 + x: 125 + y: 175 + width: 213 + height: 404 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 49, y: 56, z: 53, w: 66} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d7385cc81cbeb9644a206e096de74395 + internalID: 1870731578 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 32f64e2cb2b18cc478715bf2a5c9a5f9 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sslx_Ui_SheZhi_YinLiangAnJian_v01_0: 1870731578 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/Bullet.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/Bullet.prefab index 2dfd8a85..742edf26 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/Bullet.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/Bullet.prefab @@ -224,7 +224,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 0.57014847, g: 1, b: 0.21226418, a: 0.42745098} + maxColor: {r: 0.13034001, g: 0.3893672, b: 0.9528302, a: 0.42745098} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -4880,7 +4880,7 @@ MeshRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2996777709463811619} m_Enabled: 1 - m_CastShadows: 1 + m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 @@ -5030,7 +5030,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 1 + scalar: 0.5 minScalar: 5 maxCurve: serializedVersion: 2 @@ -5137,7 +5137,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 0.57014847, g: 1, b: 0.21226418, a: 0.42745098} + maxColor: {r: 0, g: 0.19540465, b: 0.8113208, a: 0.42745098} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v03_OnlyRewardChooseCard.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v03_OnlyRewardChooseCard.prefab index 13adbfdc..6480a114 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v03_OnlyRewardChooseCard.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v03_OnlyRewardChooseCard.prefab @@ -34,8 +34,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.5903, y: -40.819817} - m_SizeDelta: {x: 89.2419, y: 81.6406} + m_AnchoredPosition: {x: 1.3434, y: -48.1811} + m_SizeDelta: {x: 110, y: 94.6501} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8570206769618557703 CanvasRenderer: @@ -105,12 +105,14 @@ RectTransform: m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 1 m_Children: + - {fileID: 7858732250489100000} + - {fileID: 5361034384745054038} - {fileID: 2056259031377826568} m_Father: {fileID: 1023735660978789101} 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.8811469, y: 18.575363} + m_AnchoredPosition: {x: -3, y: 18.575363} m_SizeDelta: {x: 147.36, y: 219.15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3010471805907384197 @@ -141,7 +143,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -767124711, guid: 7af48fcde55284c40b53d553f7083079, type: 3} + m_Sprite: {fileID: -779400533, guid: 3951f3b4e4fa934428664cbbcc23df6a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -185,8 +187,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.00079345703, y: 39.51658} - m_SizeDelta: {x: 100, y: 80.7449} + m_AnchoredPosition: {x: 1.9624, y: 53.8} + m_SizeDelta: {x: 111.2381, y: 85.6419} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8469261094915815852 CanvasRenderer: @@ -216,7 +218,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 182c3c1bcddd9bd4a86cdaaf70e3d6b0, type: 3} + m_Sprite: {fileID: 1398329276, guid: 1b86d79d3a5223e45b16307bd6ed2b92, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -260,7 +262,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.000023841858, y: -11.25} + m_AnchoredPosition: {x: -2.4, y: -6.6} m_SizeDelta: {x: 20.239, y: 22.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8988904120357358624 @@ -305,81 +307,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 1 ---- !u!1 &1584380816869416965 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1559862289239033703} - - component: {fileID: 2584679090611171910} - - component: {fileID: 8515237810631829489} - m_Layer: 5 - m_Name: MidBorder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1559862289239033703 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584380816869416965} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1023735660978789101} - 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.3478217, y: 16.799988} - m_SizeDelta: {x: 112.5645, y: 34.8011} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2584679090611171910 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584380816869416965} - m_CullTransparentMesh: 1 ---- !u!114 &8515237810631829489 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584380816869416965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -1367631166, guid: c227a99a29e376f4ebbd02346dc40c6e, 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 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &2745326731275635524 GameObject: m_ObjectHideFlags: 0 @@ -414,8 +341,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.8369, y: -1.8462} - m_SizeDelta: {x: 18.0408, y: 206.3964} + m_AnchoredPosition: {x: 2.8178, y: -0.4513} + m_SizeDelta: {x: 22.0027, y: 213.6089} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2838261514530874316 CanvasRenderer: @@ -445,7 +372,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -38845363, guid: 1a379197f4a248348889f3c0233f5c99, type: 3} + m_Sprite: {fileID: -1846485671, guid: c531aa26b66654a4caae18840cb08744, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -489,7 +416,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.000015258789, y: 12.259901} + m_AnchoredPosition: {x: -2.3999991, y: 20.1} m_SizeDelta: {x: 17.977, y: 24.8279} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5144435355750827213 @@ -534,6 +461,81 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 3 +--- !u!1 &4662204001632911125 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7552119204142249367} + - component: {fileID: 2011782480440086206} + - component: {fileID: 5984446742580670497} + m_Layer: 5 + m_Name: BackGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7552119204142249367 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4662204001632911125} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1023735660978789101} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1.1811, y: 4.2482} + m_SizeDelta: {x: 209.4314, y: 302.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2011782480440086206 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4662204001632911125} + m_CullTransparentMesh: 1 +--- !u!114 &5984446742580670497 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4662204001632911125} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -724633554, guid: c861ddefe26cc154e8de878c8bb9a40b, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5995774149759301209 GameObject: m_ObjectHideFlags: 0 @@ -561,15 +563,15 @@ RectTransform: m_GameObject: {fileID: 5995774149759301209} 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_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 6791116358046049278} 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: 45, y: 45} + m_AnchoredPosition: {x: -0.000048637, y: 0.00007176399} + m_SizeDelta: {x: 56.695, y: 63.391} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7730899574388323005 CanvasRenderer: @@ -592,7 +594,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 @@ -601,11 +603,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 60 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -645,8 +647,6 @@ RectTransform: m_Children: - {fileID: 6424003275553431901} - {fileID: 181647516711415625} - - {fileID: 7858732250489100000} - - {fileID: 5361034384745054038} m_Father: {fileID: 1023735660978789101} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -727,8 +727,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: -96.91194, y: 139.1} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: -76.5, y: 139.7} + m_SizeDelta: {x: 28.3474, y: 31.6956} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5775220085188748417 CanvasRenderer: @@ -758,7 +758,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1928548215, guid: 3942cb915be4d49458ab17ae5bef32b4, type: 3} + m_Sprite: {fileID: 290022622, guid: 16ae439c29f1a134b87db29ac0811e9f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -798,12 +798,12 @@ RectTransform: m_GameObject: {fileID: 7164379299506578448} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 5} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 8722579538377988857} + - {fileID: 7552119204142249367} - {fileID: 7930228531046603438} - - {fileID: 1559862289239033703} - {fileID: 5760218553471671969} - {fileID: 6791116358046049278} - {fileID: 6740619428319462914} @@ -835,7 +835,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1005,7 +1005,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 @@ -1143,15 +1143,15 @@ RectTransform: m_GameObject: {fileID: 7871409229461463633} 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_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 7930228531046603438} + m_Father: {fileID: 5760218553471671969} 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: 2.9199, y: -55.779} - m_SizeDelta: {x: 89.549, y: 56.809} + m_AnchoredPosition: {x: 2.5464, y: -57.237206} + m_SizeDelta: {x: 173.0744, y: 129.4937} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8697258967315947806 CanvasRenderer: @@ -1183,7 +1183,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 10 + m_FontSize: 17 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 1 @@ -1222,15 +1222,15 @@ RectTransform: m_GameObject: {fileID: 8343831271617190617} 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_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 7930228531046603438} + m_Father: {fileID: 5760218553471671969} 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.00093412, y: -17.750097} - m_SizeDelta: {x: 95.387, y: 19.2492} + m_AnchoredPosition: {x: 2.8, y: -5} + m_SizeDelta: {x: 212.1199, y: 32.6853} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &386391247202283946 CanvasRenderer: @@ -1262,7 +1262,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 15 + m_FontSize: 25 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/CardReward.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/CardReward.prefab index ac677402..980f5a0a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/CardReward.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/CardReward.prefab @@ -36,10 +36,10 @@ RectTransform: - {fileID: 4123142054426980354} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 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: 0, y: 0} + m_SizeDelta: {x: 235, y: 414} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5082381512918421411 CanvasRenderer: @@ -265,8 +265,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: -94} - m_SizeDelta: {x: 180, y: 160} + m_AnchoredPosition: {x: 0, y: -100} + m_SizeDelta: {x: 210, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2733445211847259160 CanvasRenderer: @@ -296,7 +296,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: a8b50b2b4dd2d3b429b213be2a984e0b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ChooseCardPanel.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ChooseCardPanel.prefab index d9e34319..4462af13 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ChooseCardPanel.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ChooseCardPanel.prefab @@ -247,15 +247,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 40 + m_Left: 115 m_Right: 0 - m_Top: 25 + m_Top: 41 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 235, y: 414} - m_Spacing: {x: 145, y: 20} + m_Spacing: {x: 70, y: 20} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &5938922564071319870 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/MoneyReward.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/MoneyReward.prefab index 310a48ea..4b40d0ac 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/MoneyReward.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/MoneyReward.prefab @@ -34,8 +34,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: -94} - m_SizeDelta: {x: 180, y: 160} + m_AnchoredPosition: {x: -8, y: -95} + m_SizeDelta: {x: 167.2862, y: 177.0422} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6432755592450523591 CanvasRenderer: @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 158022059, guid: 702e3230b1367444d9d459f02db67668, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -193,7 +193,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -94} - m_SizeDelta: {x: 180, y: 160} + m_SizeDelta: {x: 235, y: 414} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1534610038301911794 CanvasRenderer: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/Sevant/ServantSkill/SkillUI.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/Sevant/ServantSkill/SkillUI.prefab index 2e8e79be..8aec8282 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/Sevant/ServantSkill/SkillUI.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Sevant/ServantSkill/SkillUI.prefab @@ -75,6 +75,85 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2623737194515270741 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8033696510911491323} + - component: {fileID: 7003721765562612993} + - component: {fileID: 2458353571100227648} + m_Layer: 7 + m_Name: CoolDown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8033696510911491323 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2623737194515270741} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 6590472616143143499} + 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.00000041723, y: -0.00000017136} + m_SizeDelta: {x: 89.983, y: 89.982} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7003721765562612993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2623737194515270741} + m_CullTransparentMesh: 1 +--- !u!114 &2458353571100227648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2623737194515270741} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 4 --- !u!1 &7216391201375852461 GameObject: m_ObjectHideFlags: 0 @@ -109,6 +188,7 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 8152314499649109330} + - {fileID: 8033696510911491323} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -239,10 +319,18 @@ MonoBehaviour: value: 0 throwRange: 0 effectRange: 0 + coolDown: 0 + useTimes: 0 + storageTimes: 0 + currentCoolDown: 0 + currentUseTimes: 0 + currentStorageTimes: 0 skillType: 0 Icon: {fileID: 0} - col: {fileID: 0} - image: {fileID: 0} + coolDownIcon: {fileID: 0} + col: {fileID: 7217144041846661793} + image: {fileID: 5523502723289762611} button: {fileID: 0} + coolDownText: {fileID: 2458353571100227648} speed: 25 atlasPath: ServentSkill/Sslx_Ui_SuiCong_JiNeng_v01 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 3b48524a..228d33c9 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -642,7 +642,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 49967998} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00001480478} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -650,8 +650,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 6.550003} + m_SizeDelta: {x: 0, y: -13.12} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &49968000 MonoBehaviour: @@ -666,7 +666,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -686,7 +686,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u97F3\u9891" + m_Text: "\u97F3 \u9891" --- !u!222 &49968001 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1422,7 +1422,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 114174845} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.000018841} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1430,8 +1430,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -7.5, y: -0.5} - m_SizeDelta: {x: -35, y: -13} + m_AnchoredPosition: {x: -12.5, y: -0.000018119812} + m_SizeDelta: {x: -25, y: 0.000022888} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &114174847 MonoBehaviour: @@ -1456,11 +1456,11 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 20 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -1881,8 +1881,8 @@ RectTransform: m_GameObject: {fileID: 136696772} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.00000092538994} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 512020677} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1911,7 +1911,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 735299134, guid: ace3021fc09b4a84991c5535361f7305, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2666,8 +2666,8 @@ Transform: - {fileID: 1601223406} - {fileID: 1915587657} - {fileID: 469385439} - - {fileID: 172253752} - {fileID: 1504312509} + - {fileID: 172253752} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &197140185 @@ -3858,7 +3858,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: 143.5, y: 0} + m_AnchoredPosition: {x: 134, y: 0} m_SizeDelta: {x: 41.15, y: 39.21} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &287427687 @@ -3936,8 +3936,8 @@ 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.000015259, y: -161.07} - m_SizeDelta: {x: 350, y: 78.07} + m_AnchoredPosition: {x: 0, y: -170} + m_SizeDelta: {x: 340, y: 73} m_Pivot: {x: 0.5, y: 1} --- !u!114 &296207960 MonoBehaviour: @@ -3952,15 +3952,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 1694164675, guid: 2086866033a1171448dc9261291aafa8, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4836,7 +4836,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 341945981} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.00003436824} m_LocalScale: {x: 0.9997415, y: 0.9997415, z: 0.9997415} m_ConstrainProportionsScale: 0 m_Children: @@ -4846,8 +4846,8 @@ 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.000030517578, y: -73} - m_SizeDelta: {x: 350, y: 89.07} + m_AnchoredPosition: {x: 0, y: -70} + m_SizeDelta: {x: 340, y: 73} m_Pivot: {x: 0.5, y: 1} --- !u!114 &341945983 MonoBehaviour: @@ -4862,15 +4862,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 1694164675, guid: 2086866033a1171448dc9261291aafa8, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5369,7 +5369,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 368102274} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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_ConstrainProportionsScale: 0 @@ -5379,8 +5379,8 @@ 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: 0} - m_SizeDelta: {x: 150, y: 50} + m_AnchoredPosition: {x: 0, y: 63} + m_SizeDelta: {x: 311.96, y: 135.25} m_Pivot: {x: 0.5, y: 1} --- !u!114 &368102276 MonoBehaviour: @@ -5395,15 +5395,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6132076, g: 0.5929602, b: 0.5929602, a: 0.62352943} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -1094772320, guid: 8dd42b56a643d5444987e0f9ee5b5d94, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5459,8 +5459,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: 1025, y: -275} - m_SizeDelta: {x: 350, y: 550} + m_AnchoredPosition: {x: 1070, y: -275} + m_SizeDelta: {x: 400, y: 550} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &377674264 MonoBehaviour: @@ -5475,15 +5475,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.59607846} + m_Color: {r: 0.8962264, g: 0.8962264, b: 0.8962264, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -395849654, guid: 89d2e111086186d45a91e52bfb95775f, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6195,15 +6195,15 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2039448198} + - {fileID: 1865372987} - {fileID: 1275515500} - {fileID: 1794027477} - - {fileID: 1865372987} m_Father: {fileID: 1240164229} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 175, y: -275} - m_SizeDelta: {x: 350, y: 550} + m_AnchoredPosition: {x: 200, y: -275} + m_SizeDelta: {x: 400, y: 550} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &414242182 MonoBehaviour: @@ -6218,15 +6218,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.59607846} + m_Color: {r: 0.8962264, g: 0.8962264, b: 0.8962264, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -395849654, guid: 89d2e111086186d45a91e52bfb95775f, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6345,7 +6345,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 423552670} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000018195} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -6356,8 +6356,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: 60.73, y: 0} - m_SizeDelta: {x: 168.1, y: 39.2} + m_AnchoredPosition: {x: 54.23, y: 0} + m_SizeDelta: {x: 181.1, y: 27.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &423552672 MonoBehaviour: @@ -6444,7 +6444,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 1267110475, guid: 3763e79e519b4744e8498cf3e15281ab, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6764,7 +6764,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 464618902} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00001480478} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6772,8 +6772,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 6.75} + m_SizeDelta: {x: 0, y: -13.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &464618904 MonoBehaviour: @@ -6788,7 +6788,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6808,7 +6808,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u89C6\u9891" + m_Text: "\u89C6 \u9891" --- !u!222 &464618905 CanvasRenderer: m_ObjectHideFlags: 0 @@ -7564,7 +7564,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: 143.5, y: 0} + m_AnchoredPosition: {x: 132.8, y: 0} m_SizeDelta: {x: 41.15, y: 39.21} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &484006315 @@ -8029,7 +8029,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 513901905} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000010644} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -8038,8 +8038,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: 41.52, y: 0} - m_SizeDelta: {x: 150.87, y: 26.29} + m_AnchoredPosition: {x: 31, y: 0} + m_SizeDelta: {x: 150.87, y: 22.06} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &513901907 MonoBehaviour: @@ -8085,7 +8085,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1153376430} m_Direction: 1 m_Value: 1 - m_Size: 0.2 + m_Size: 0.15 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -8110,7 +8110,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 1267110475, guid: 3763e79e519b4744e8498cf3e15281ab, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8870,7 +8870,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 555311524} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00001110359} + m_LocalPosition: {x: 0, y: 0, z: -0.000045471832} m_LocalScale: {x: 0.9997415, y: 0.9997415, z: 0.9997415} m_ConstrainProportionsScale: 0 m_Children: @@ -8880,8 +8880,8 @@ 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: -251.14} - m_SizeDelta: {x: 350, y: 55.03} + m_AnchoredPosition: {x: 0, y: -269.99997} + m_SizeDelta: {x: 340, y: 73} m_Pivot: {x: 0.5, y: 1} --- !u!114 &555311526 MonoBehaviour: @@ -8896,15 +8896,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 1694164675, guid: 2086866033a1171448dc9261291aafa8, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9292,7 +9292,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 594397912} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.0000029753} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -9300,8 +9300,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -7.5, y: -0.5} - m_SizeDelta: {x: -35, y: -13} + m_AnchoredPosition: {x: -12.5, y: 0.000017166138} + m_SizeDelta: {x: -25, y: -0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &594397914 MonoBehaviour: @@ -9326,11 +9326,11 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 20 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 2 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -9534,8 +9534,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: 600, y: -275} - m_SizeDelta: {x: 350, y: 550} + m_AnchoredPosition: {x: 635, y: -275} + m_SizeDelta: {x: 400, y: 550} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &612797173 MonoBehaviour: @@ -9550,15 +9550,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.59607846} + m_Color: {r: 0.8962264, g: 0.8962264, b: 0.8962264, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -395849654, guid: 89d2e111086186d45a91e52bfb95775f, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -10497,7 +10497,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 692305853} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00001480478} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -10505,8 +10505,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 7.290001} + m_SizeDelta: {x: 0, y: -14.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &692305855 MonoBehaviour: @@ -10521,7 +10521,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -10541,7 +10541,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6E38\u620F\u9009\u9879" + m_Text: "\u6E38 \u620F \u9009 \u9879" --- !u!222 &692305856 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10737,7 +10737,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 725512355} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000018195} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -10748,8 +10748,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: 60.73, y: 0} - m_SizeDelta: {x: 168.1, y: 39.2} + m_AnchoredPosition: {x: 54.23, y: 0} + m_SizeDelta: {x: 181.1, y: 27.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &725512357 MonoBehaviour: @@ -10830,7 +10830,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 1267110475, guid: 3763e79e519b4744e8498cf3e15281ab, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -10875,8 +10875,8 @@ RectTransform: m_GameObject: {fileID: 732732825} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.00000092538994} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1627366719} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10905,7 +10905,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 735299134, guid: ace3021fc09b4a84991c5535361f7305, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11751,7 +11751,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 794365817} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -11760,7 +11760,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 43} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &794365819 @@ -12771,18 +12771,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 867255144} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0000027759} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000007931132} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1779627254} m_Father: {fileID: 328558928} 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: 506.47, y: -383} - m_SizeDelta: {x: 187.05, y: 60} + m_AnchoredPosition: {x: 514, y: -347} + m_SizeDelta: {x: 691, y: 158} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &867255146 MonoBehaviour: @@ -12805,7 +12805,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.655583, g: 1, b: 0.5990566, a: 1} + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -12860,7 +12860,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 2137927476, guid: de8e54fdb68f4864c80bebb0c8079497, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -14017,8 +14017,8 @@ 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.000015259, y: -83} - m_SizeDelta: {x: 350, y: 78.07} + m_AnchoredPosition: {x: 0.000015259, y: -70} + m_SizeDelta: {x: 340, y: 73} m_Pivot: {x: 0.5, y: 1} --- !u!114 &968170741 MonoBehaviour: @@ -14033,15 +14033,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 1694164675, guid: 2086866033a1171448dc9261291aafa8, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -14571,7 +14571,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000430795} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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_ConstrainProportionsScale: 0 @@ -14581,8 +14581,8 @@ 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: 0} - m_SizeDelta: {x: 150, y: 50} + m_AnchoredPosition: {x: 0, y: 63} + m_SizeDelta: {x: 311.96, y: 135.25} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1000430797 MonoBehaviour: @@ -14597,15 +14597,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6132076, g: 0.5929602, b: 0.5929602, a: 0.62352943} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -1094772320, guid: 8dd42b56a643d5444987e0f9ee5b5d94, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -14648,7 +14648,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1007253462} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.000031724} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -14656,8 +14656,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -7.5, y: -0.5} - m_SizeDelta: {x: -35, y: -13} + m_AnchoredPosition: {x: -12.5, y: -0.000018119812} + m_SizeDelta: {x: -25, y: 0.000013351} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1007253464 MonoBehaviour: @@ -14682,11 +14682,11 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 20 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -14807,7 +14807,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1014114697} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000010644} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -14816,8 +14816,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: 41.52, y: 0} - m_SizeDelta: {x: 150.87, y: 26.29} + m_AnchoredPosition: {x: 31, y: 0} + m_SizeDelta: {x: 150.87, y: 22.06} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1014114699 MonoBehaviour: @@ -14863,7 +14863,7 @@ MonoBehaviour: m_HandleRect: {fileID: 2084732123} m_Direction: 1 m_Value: 1 - m_Size: 0.2 + m_Size: 0.15 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -14888,7 +14888,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 1267110475, guid: 3763e79e519b4744e8498cf3e15281ab, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -15269,8 +15269,8 @@ MonoBehaviour: type: 3} rewardTipPrefabPotion: {fileID: 5701223604648436844, guid: 04936e8063f97a84584610b93ffbb56a, type: 3} - cardTipIcon: {fileID: 21300000, guid: 182c3c1bcddd9bd4a86cdaaf70e3d6b0, type: 3} - moneyTipIcon: {fileID: 21300000, guid: 02691098c39ccd6458dd3771b3004071, type: 3} + cardTipIcon: {fileID: 21300000, guid: a8b50b2b4dd2d3b429b213be2a984e0b, type: 3} + moneyTipIcon: {fileID: 158022059, guid: 702e3230b1367444d9d459f02db67668, type: 3} legacyTipIcon: {fileID: 21300000, guid: 00234b60ba12993428c782adbed08140, type: 3} potionTipIcon: {fileID: 21300000, guid: 0f0274fed944193419950861f0f57273, type: 3} rewardsList: [] @@ -15346,7 +15346,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 28 + m_Left: 60 m_Right: 0 m_Top: 30 m_Bottom: 0 @@ -15522,7 +15522,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 32 + m_Left: 49 m_Right: 0 m_Top: 30 m_Bottom: 0 @@ -15632,7 +15632,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1094877155} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.000006611} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -15641,8 +15641,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} + m_AnchoredPosition: {x: -0.000038146973, y: -0.0000009536743} + m_SizeDelta: {x: 0.00012207, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1108322115 GameObject: @@ -16552,10 +16552,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1239633464} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: -0.000000014901161, y: 0} - m_AnchorMax: {x: 0.19999999, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_AnchorMin: {x: -0.000000029802322, y: 0} + m_AnchorMax: {x: 0.14999998, y: 1} + m_AnchoredPosition: {x: 0, y: 0.0000009536743} + m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1153376431 MonoBehaviour: @@ -16577,7 +16577,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 1870731578, guid: 08760973ab9c0e444976b3acf82d4b5b, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16949,8 +16949,8 @@ 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.000015259, y: -239.14001} - m_SizeDelta: {x: 350, y: 78.07} + m_AnchoredPosition: {x: 0, y: -270} + m_SizeDelta: {x: 340, y: 73} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1178714476 MonoBehaviour: @@ -16965,15 +16965,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 1694164675, guid: 2086866033a1171448dc9261291aafa8, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -17016,7 +17016,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1179976511} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000007402395} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 0.9997415, y: 0.9997415, z: 0.9997415} m_ConstrainProportionsScale: 0 m_Children: @@ -17026,8 +17026,8 @@ 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: -306.16998} - m_SizeDelta: {x: 350, y: 55.03} + m_AnchoredPosition: {x: 0, y: -370} + m_SizeDelta: {x: 340, y: 73} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1179976513 MonoBehaviour: @@ -17042,15 +17042,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 1694164675, guid: 2086866033a1171448dc9261291aafa8, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -17561,7 +17561,7 @@ MonoBehaviour: coolDown: 1 useTimes: 1 storageTimes: 1 - currentCoolDown: 0 + currentCoolDown: 1 currentUseTimes: 1 currentStorageTimes: 1 skillType: 0 @@ -17573,10 +17573,10 @@ MonoBehaviour: value: 6 throwRange: 3 effectRange: 1 - coolDown: 1 + coolDown: 2 useTimes: 1 storageTimes: 1 - currentCoolDown: 0 + currentCoolDown: 2 currentUseTimes: 1 currentStorageTimes: 1 skillType: 2 @@ -17913,7 +17913,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1239633463} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.000014544} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -17922,8 +17922,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} + m_AnchoredPosition: {x: -0.000022888184, y: 0.000008583069} + m_SizeDelta: {x: -0.000045776, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1240164228 GameObject: @@ -17952,7 +17952,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1240164228} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0.000011896433} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -17963,8 +17963,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: -63} - m_SizeDelta: {x: 1200, y: 554.97} + m_AnchoredPosition: {x: 0, y: -20.000011} + m_SizeDelta: {x: 1279.6, y: 554.97} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1240164230 MonoBehaviour: @@ -18024,8 +18024,8 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 350, y: 550} - m_Spacing: {x: 75, y: 0} + m_CellSize: {x: 400, y: 550} + m_Spacing: {x: 35, y: 0} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &1242608528 @@ -18482,7 +18482,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1265058008 RectTransform: m_ObjectHideFlags: 0 @@ -18491,7 +18491,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1265058007} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.000007931132} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -18500,7 +18500,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: 786, y: 255} + m_AnchoredPosition: {x: 786, y: 298} m_SizeDelta: {x: 320, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1265058009 @@ -18836,7 +18836,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1275515499} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000011104} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -18846,8 +18846,8 @@ 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: -170.01999} - m_SizeDelta: {x: 350, y: 98.01999} + m_AnchoredPosition: {x: 0, y: -170} + m_SizeDelta: {x: 340, y: 73} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1275515501 MonoBehaviour: @@ -18862,15 +18862,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 1694164675, guid: 2086866033a1171448dc9261291aafa8, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -20564,18 +20564,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1417558950} - 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_ConstrainProportionsScale: 0 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000007931132} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1685999707} m_Father: {fileID: 328558928} 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: 486, y: 256} - m_SizeDelta: {x: 227.9, y: 60} + m_AnchoredPosition: {x: 766, y: -260} + m_SizeDelta: {x: 691, y: 158} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1417558952 MonoBehaviour: @@ -20646,14 +20646,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.18039216, g: 0.38205305, b: 0.7254902, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 2137927476, guid: de8e54fdb68f4864c80bebb0c8079497, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -20697,7 +20697,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1420993881} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00002220717} + m_LocalPosition: {x: 0, y: 0, z: -0.00005657541} m_LocalScale: {x: 0.9997415, y: 0.9997415, z: 0.9997415} m_ConstrainProportionsScale: 0 m_Children: @@ -20707,8 +20707,8 @@ 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.000030517578, y: -162.06999} - m_SizeDelta: {x: 350, y: 89.07} + m_AnchoredPosition: {x: 0, y: -169.99998} + m_SizeDelta: {x: 340, y: 73} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1420993883 MonoBehaviour: @@ -20723,15 +20723,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 1694164675, guid: 2086866033a1171448dc9261291aafa8, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -21574,11 +21574,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 1783050490} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: -0.000000014901161, y: 0} - m_AnchorMax: {x: 0.19999999, y: 1} + m_AnchorMin: {x: -0.000000029802322, y: 0} + m_AnchorMax: {x: 0.14999998, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} + m_SizeDelta: {x: 0, y: 14} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &1495035685 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21599,7 +21599,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 1870731578, guid: 08760973ab9c0e444976b3acf82d4b5b, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22489,7 +22489,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: 143.5, y: 0} + m_AnchoredPosition: {x: 132.8, y: 0} m_SizeDelta: {x: 41.15, y: 39.21} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1537407233 @@ -23330,17 +23330,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1608025176} 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_ConstrainProportionsScale: 0 + m_LocalPosition: {x: 0, y: 0, z: 0.000007931132} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1740592868} m_Father: {fileID: 328558928} 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: -729, y: -293} - m_SizeDelta: {x: 234.5, y: 66.95} + m_AnchoredPosition: {x: -777, y: -260} + m_SizeDelta: {x: 691, y: 158} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1608025178 MonoBehaviour: @@ -23423,14 +23423,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.18823427, g: 0.31439832, b: 0.8867924, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 2137927476, guid: de8e54fdb68f4864c80bebb0c8079497, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -23889,8 +23889,8 @@ RectTransform: m_GameObject: {fileID: 1634412163} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.00000092538994} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 872451508} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -23919,7 +23919,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 735299134, guid: ace3021fc09b4a84991c5535361f7305, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -24242,11 +24242,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 1 + m_FontSize: 75 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 - m_MaxSize: 42 + m_MaxSize: 75 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -24354,7 +24354,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.000015259, y: 0} + m_AnchoredPosition: {x: 0, y: -25} m_SizeDelta: {x: 600, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1691448870 @@ -25226,7 +25226,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -25235,11 +25235,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 1 + m_FontSize: 75 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 50 + m_MaxSize: 90 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -26108,11 +26108,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 1 + m_FontSize: 75 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 42 + m_MaxSize: 75 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -26496,7 +26496,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1783050489} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.000020742} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -26505,8 +26505,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} + m_AnchoredPosition: {x: 0.0024795532, y: 0.0000104904175} + m_SizeDelta: {x: 0.0050354, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1786017148 GameObject: @@ -27011,7 +27011,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1794027476} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000011103585} + m_LocalPosition: {x: 0, y: 0, z: 0.000011367957} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -27021,8 +27021,8 @@ 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: -268.03998} - m_SizeDelta: {x: 350, y: 98.01999} + m_AnchoredPosition: {x: 0, y: -270} + m_SizeDelta: {x: 340, y: 73} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1794027478 MonoBehaviour: @@ -27037,15 +27037,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 1694164675, guid: 2086866033a1171448dc9261291aafa8, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -27761,7 +27761,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1845795078} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000010644} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -27770,8 +27770,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: 41.52, y: 0} - m_SizeDelta: {x: 150.87, y: 26.29} + m_AnchoredPosition: {x: 31, y: 0} + m_SizeDelta: {x: 150.87, y: 22.06} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1845795080 MonoBehaviour: @@ -27817,7 +27817,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1495035684} m_Direction: 1 m_Value: 1 - m_Size: 0.2 + m_Size: 0.15 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -27842,7 +27842,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 1267110475, guid: 3763e79e519b4744e8498cf3e15281ab, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -27902,8 +27902,8 @@ RectTransform: m_GameObject: {fileID: 1847720222} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.00000092538994} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 584589960} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -27932,7 +27932,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 735299134, guid: ace3021fc09b4a84991c5535361f7305, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -28235,7 +28235,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1865372986} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.000022471542} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -28245,8 +28245,8 @@ 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: -72} - m_SizeDelta: {x: 350, y: 98.01999} + m_AnchoredPosition: {x: 0, y: -70} + m_SizeDelta: {x: 340, y: 73} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1865372988 MonoBehaviour: @@ -28261,15 +28261,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 1694164675, guid: 2086866033a1171448dc9261291aafa8, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -29940,8 +29940,8 @@ 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: 0} - m_SizeDelta: {x: 150, y: 50} + m_AnchoredPosition: {x: 0, y: 63} + m_SizeDelta: {x: 311.96, y: 135.25} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2039448199 MonoBehaviour: @@ -29956,15 +29956,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6132076, g: 0.5929602, b: 0.5929602, a: 0.62352943} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -1094772320, guid: 8dd42b56a643d5444987e0f9ee5b5d94, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -30473,10 +30473,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1094877156} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: -0.000000014901161, y: 0} - m_AnchorMax: {x: 0.19999999, y: 1} + m_AnchorMin: {x: -0.000000029802322, y: 0} + m_AnchorMax: {x: 0.14999998, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2084732124 MonoBehaviour: @@ -30498,7 +30498,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 1870731578, guid: 08760973ab9c0e444976b3acf82d4b5b, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -30776,7 +30776,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131174847} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000018195} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -30787,8 +30787,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: 51, y: 0} - m_SizeDelta: {x: 187.55, y: 39.2} + m_AnchoredPosition: {x: 54.23, y: 0} + m_SizeDelta: {x: 181.1, y: 27.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2131174849 MonoBehaviour: @@ -30867,7 +30867,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 1267110475, guid: 3763e79e519b4744e8498cf3e15281ab, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -30902,7 +30902,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2131355445 RectTransform: m_ObjectHideFlags: 0 @@ -30911,7 +30911,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131355444} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0.000007931132} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -30920,7 +30920,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: 301.91} + m_AnchoredPosition: {x: 0, y: 344.91} m_SizeDelta: {x: 300, y: 77.63} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2131355446 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs index a5bc98d0..5f1da5b5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs @@ -201,6 +201,7 @@ public class TurnMaster : Singleton if(skill .currentCoolDown >0) { skill.currentCoolDown--; + ServentStateManager.Instance.servant.skillNodeList[skill.effectIndex].coolDownText.text=skill .currentCoolDown .ToString (); } if (skill.currentCoolDown <= 0) @@ -210,7 +211,12 @@ public class TurnMaster : Singleton } } - } + if(skill .currentStorageTimes >0) + { + ServentStateManager.Instance.servant.skillNodeList[skill.effectIndex].GetComponent ().sprite = skill.Icon; + ServentStateManager.Instance.servant.skillNodeList[skill.effectIndex].coolDownText.gameObject.SetActive(false); + } + } } //老吊写的函数 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs index 9e663e12..436352da 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs @@ -39,7 +39,7 @@ public class ServantBottleCat : Servant } public void PreEffect_0() { - MovePreView(); + MovePreView(); } public void PreEffect_1() { @@ -83,6 +83,8 @@ public class ServantBottleCat : Servant currentNode.enemyNode.EnemyState.currentHP -= skillList[currentSkillInex].value; anim.SetTrigger("shoot"); + + SettleSkillCoolDown(skillList[currentSkillInex], skillNodeList[currentSkillInex]); } } @@ -101,9 +103,10 @@ public class ServantBottleCat : Servant { node.whoColour = MapUnity.WhoColour.playerColour; - anim.SetTrigger("shoot"); + } - + anim.SetTrigger("shoot"); + SettleSkillCoolDown(skillList[currentSkillInex], skillNodeList[currentSkillInex]); } ResetPreView(); } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs index e315ee8f..6dbf9e40 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs @@ -3,9 +3,9 @@ using System.Collections; using System.Collections.Generic; using Unity.VisualScripting; using UnityEngine; +using UnityEngine.UI; using UnityEngine.InputSystem; -using UnityEngine.Playables; -using static Servant; + public class Servant : MonoBehaviour { @@ -81,10 +81,14 @@ public class Servant : MonoBehaviour { GameManager.Instance.character = GameManager.SelectedCharacter.servant; TurnMaster.Instance.servantAction = TurnMaster.ServantAction.useSkill; - //技能范围预览(目前是button触发) + //技能范围预览(button触发添加技能序号) //MovePreView(); - SkillePreviewSelector(currentSkillInex); - ColorInUseSkillUI(); + if (skillList[currentSkillInex ].currentStorageTimes > 0) + { + SkillePreviewSelector(currentSkillInex); + ColorInUseSkillUI(); + } + } else if (Physics.Raycast(ray, out RaycastHit raycastHitMap, 500, chooseNodeLayerMask .value)) { @@ -278,6 +282,12 @@ public class Servant : MonoBehaviour Usermanager.Instance.bleedRealize(); //减体力 GameManager.Instance.servantState.currentStepRange -= 1; + //同步技能UI + if (GameManager.Instance.servantState.currentStepRange <= 0) + { + skillList[0].currentStorageTimes = 0; + skillNodeList[0].image.sprite = skillList[0].coolDownIcon; + } } this.gameObject.transform.position = new Vector3(mapNode.transform.position.x, 0.5f, mapNode.transform.position.z); @@ -322,9 +332,27 @@ public class Servant : MonoBehaviour anim.transform.localScale = new Vector3(0.06f, 0.06f, 0.06f); } } - public void SettleSkillCoolDown() + //技能冷却结算 + public void SettleSkillCoolDown(ServantSkill skill ,ServantSkillNode skillNode) { - + if(skill .currentStorageTimes >0) + { + skill.currentUseTimes--; + if(skill .currentUseTimes <=0) + { + skill.currentStorageTimes--; + skill.currentUseTimes = skill.useTimes; + } + } + if (skill.currentStorageTimes <= 0) + { + skillNode.image .sprite = skill.coolDownIcon; + } + if (skill.currentStorageTimes < skill.storageTimes) + { + skillNode.coolDownText.gameObject.SetActive(true); + skillNode.coolDownText.text = skill.currentCoolDown .ToString (); + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ServantSkillNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ServantSkillNode.cs index 686895cc..da439724 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ServantSkillNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ServantSkillNode.cs @@ -12,7 +12,7 @@ public class ServantSkillNode : MonoBehaviour public Collider col; public Image image; public Button button; - + public Text coolDownText; public float speed; public string atlasPath;