diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02.meta new file mode 100644 index 00000000..fd875c6d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 005b4f0aacf863d43958a7cb339b8eb8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_BaoShi_v02.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_BaoShi_v02.png new file mode 100644 index 00000000..8e101e5e Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_BaoShi_v02.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_BaoShi_v02.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_BaoShi_v02.png.meta new file mode 100644 index 00000000..917e0158 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_BaoShi_v02.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: c531aa26b66654a4caae18840cb08744 +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: Card_Ui_BaoShi_v02_0 + rect: + serializedVersion: 2 + x: 1918 + y: 427 + width: 177 + height: 1637 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 78f1b70e0fd98c64c912357bec502042 + internalID: -1846485671 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e359ba2e279cb714fa40aa40a0c5285c + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Card_Ui_BaoShi_v02_0: -1846485671 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_BianKuang_v02.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_BianKuang_v02.png new file mode 100644 index 00000000..6966837e Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_BianKuang_v02.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_BianKuang_v02.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_BianKuang_v02.png.meta new file mode 100644 index 00000000..d7776f59 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_BianKuang_v02.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: b9f08ba7ee791ea4ba1d5ccedcd162eb +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: Card_Ui_BianKuang_v02_0 + rect: + serializedVersion: 2 + x: 1385 + y: 399 + width: 1186 + height: 1701 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 511b5c0c0ae24dd47b1a553a9dcb3d0d + internalID: -86317797 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c056eb1edb928094c8a591c4789f1624 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Card_Ui_BianKuang_v02_0: -86317797 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_DiMian_v02.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_DiMian_v02.png new file mode 100644 index 00000000..87f982f4 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_DiMian_v02.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_DiMian_v02.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_DiMian_v02.png.meta new file mode 100644 index 00000000..6b6b222a --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_DiMian_v02.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 6ee9c76a053e25e498141299eb240f19 +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: Card_Ui_DiMian_v02_0 + rect: + serializedVersion: 2 + x: 1461 + y: 403 + width: 1091 + height: 1574 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f80f09c50a9662d4e8be41b4afc8ad73 + internalID: 2056361523 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: febc3bd332e50ca47baa64460be91502 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Card_Ui_DiMian_v02_0: 2056361523 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_LiTu_v02.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_LiTu_v02.png new file mode 100644 index 00000000..070c1ceb Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_LiTu_v02.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_LiTu_v02.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_LiTu_v02.png.meta new file mode 100644 index 00000000..9fe5ff32 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_LiTu_v02.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 889bf1f651b88544c9c0d66a815ca4a4 +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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_NengLiang_v02 (7).png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_NengLiang_v02 (7).png new file mode 100644 index 00000000..8d394d25 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_NengLiang_v02 (7).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_NengLiang_v02 (7).png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_NengLiang_v02 (7).png.meta new file mode 100644 index 00000000..a4d2494c --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_NengLiang_v02 (7).png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 2dbf308eaad54af4ca56e3b2d45f5de8 +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: Card_Ui_NengLiang_v02 (7)_0 + rect: + serializedVersion: 2 + x: 1899 + y: 1084 + width: 228 + height: 84 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 56e38877052be514c80391db32aa1c8f + internalID: -937068834 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 72337061124bd4d4789078685528b885 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Card_Ui_NengLiang_v02 (7)_0: -937068834 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_NengLiang_v02.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_NengLiang_v02.png new file mode 100644 index 00000000..a2ad4ecf Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_NengLiang_v02.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_NengLiang_v02.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_NengLiang_v02.png.meta new file mode 100644 index 00000000..ca423f83 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_NengLiang_v02.png.meta @@ -0,0 +1,171 @@ +fileFormatVersion: 2 +guid: bd3849e15fd6a4d4b8d841d38a318f1b +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: Card_Ui_NengLiang_v02_0 + rect: + serializedVersion: 2 + x: 855 + y: 752 + width: 322 + height: 371 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 829c7a539d1d00d47a76a09c9ee3c60a + internalID: 1978882971 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Card_Ui_NengLiang_v02_1 + rect: + serializedVersion: 2 + x: 1231 + y: 755 + width: 322 + height: 368 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2e761e09107f41942b17eed05f8bee6e + internalID: 1688620508 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 10699d6e70ce4f04d877ef1cf3300a3e + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Card_Ui_NengLiang_v02_0: 1978882971 + Card_Ui_NengLiang_v02_1: 1688620508 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_SiFang_v02.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_SiFang_v02.png new file mode 100644 index 00000000..a4de0d9d Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_SiFang_v02.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_SiFang_v02.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_SiFang_v02.png.meta new file mode 100644 index 00000000..a851ca99 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/dijikapai/V02/Card_Ui_SiFang_v02.png.meta @@ -0,0 +1,217 @@ +fileFormatVersion: 2 +guid: 4aac8fa7e42d63b48b240ff5ed1a1984 +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: Card_Ui_SiFang_v02_0 + rect: + serializedVersion: 2 + x: 1164 + y: 1047 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 39ab9fd00b18a684f93885077a562f7d + internalID: -1153553389 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Card_Ui_SiFang_v02_1 + rect: + serializedVersion: 2 + x: 1563 + y: 1043 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 48932c32c4992814a90e85e6090c57ca + internalID: -613217398 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Card_Ui_SiFang_v02_2 + rect: + serializedVersion: 2 + x: 1936 + y: 1050 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 79c04dab951a6024e9648c1ffb6f332b + internalID: 505445883 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Card_Ui_SiFang_v02_3 + rect: + serializedVersion: 2 + x: 2303 + y: 1079 + width: 350 + height: 350 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a1eb7f91fe3fae64184c4f62d3ba6d0d + internalID: -325667195 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: bb67daf2bcc297f44bd3a16f07004e3d + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Card_Ui_SiFang_v02_0: -1153553389 + Card_Ui_SiFang_v02_1: -613217398 + Card_Ui_SiFang_v02_2: 505445883 + Card_Ui_SiFang_v02_3: -325667195 + Card_Ui_SiFang_v02_4: -1493670737 + Card_Ui_SiFang_v02_5: 650794179 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang.meta new file mode 100644 index 00000000..ac820b42 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02a1e496a6c9ee3488ac353473fc5034 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_BianKuang_v01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_BianKuang_v01.png new file mode 100644 index 00000000..f889215c Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_BianKuang_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_BianKuang_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_BianKuang_v01.png.meta new file mode 100644 index 00000000..03a3360d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_BianKuang_v01.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: aac0a91643cf9504fa98e1cc2ffe24b3 +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_JueSeKuang_BianKuang_v01_0 + rect: + serializedVersion: 2 + x: 1114 + y: 507 + width: 1118 + height: 1422 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7dad899f5048ce64bb1431e474047dcb + internalID: -1372590706 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 33a3a2b2533586c419bf5a7651988629 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sslx_Ui_JueSeKuang_BianKuang_v01_0: -1372590706 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_DiDu_v01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_DiDu_v01.png new file mode 100644 index 00000000..ed898b46 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_DiDu_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_DiDu_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_DiDu_v01.png.meta new file mode 100644 index 00000000..3cd7fb24 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_DiDu_v01.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: d2a1db5217bc90f44aead19672b99969 +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_JueSeKuang_DiDu_v01_0 + rect: + serializedVersion: 2 + x: 1228 + y: 508 + width: 910 + height: 1232 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dd964b19946405940a773c19344a2f09 + internalID: -313539309 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 56a6dc8f87a23dc438f8d657a72aaf8e + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sslx_Ui_JueSeKuang_DiDu_v01_0: -313539309 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_LiTu_v01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_LiTu_v01.png new file mode 100644 index 00000000..540a952b Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_LiTu_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_LiTu_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_LiTu_v01.png.meta new file mode 100644 index 00000000..f7a21bff --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_LiTu_v01.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: c60016c280c6a5b43a16d667e635231d +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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_XueTiaoKuang_v01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_XueTiaoKuang_v01.png new file mode 100644 index 00000000..6b157bdf Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_XueTiaoKuang_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_XueTiaoKuang_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_XueTiaoKuang_v01.png.meta new file mode 100644 index 00000000..6218ef3c --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_XueTiaoKuang_v01.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: e54f453aebb65db41a43212eed19d105 +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_JueSeKuang_XueTiaoKuang_v01_0 + rect: + serializedVersion: 2 + x: 1178 + y: 484 + width: 999 + height: 289 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f20c1db0295e5ed4fb75e0deba98752c + internalID: -111712975 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 99bb7a7c373490244ab91979456cceb4 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sslx_Ui_JueSeKuang_XueTiaoKuang_v01_0: -111712975 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_XueTiao_v01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_XueTiao_v01.png new file mode 100644 index 00000000..733883df Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_XueTiao_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_XueTiao_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_XueTiao_v01.png.meta new file mode 100644 index 00000000..0d0076c4 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/JuSeKuang/Sslx_Ui_JueSeKuang_XueTiao_v01.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: c533039d3f4423d4cb5b985cb53597fb +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_JueSeKuang_XueTiao_v01_0 + rect: + serializedVersion: 2 + x: 1278 + y: 658 + width: 863 + height: 85 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 01009569d26bb5245b7f4cfb3f114996 + internalID: 66097935 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b7bd3900a4b1f7d47a93a4a5b4cb55de + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sslx_Ui_JueSeKuang_XueTiao_v01_0: 66097935 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset index a6b555e3..228e88c4 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d4a1869cac55dea41ba9d78c6afe6704, type: 3} m_Name: PlayerState m_EditorClassIdentifier: + playerName: Julius maxStepRange: 2 currentStepRange: 2 maxCost: 3 @@ -20,3 +21,6 @@ MonoBehaviour: currentShieldValue: 0 maxHP: 68 currentHP: 68 + cardRewardNumToChoose: 0 + cardRewardNumToGget: 0 + money: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIcon.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIcon.prefab index 90cfb215..1204515b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIcon.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIcon.prefab @@ -103,7 +103,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5955648499163411156} 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: 0.005, y: 0.005, z: 0.005} m_ConstrainProportionsScale: 1 m_Children: [] @@ -111,7 +111,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.055, y: -0.046} + m_AnchoredPosition: {x: 0.0413, y: -0.0463} m_SizeDelta: {x: 30.003, y: 29.992} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4953326812075947436 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab new file mode 100644 index 00000000..2f095aba --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab @@ -0,0 +1,237 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &151432887577591654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4255995714669253555} + - component: {fileID: 8024669248513866792} + - component: {fileID: 337482096340864640} + m_Layer: 0 + m_Name: Text (Legacy) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4255995714669253555 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151432887577591654} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7957164916501873808} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 5.2, y: -4.9} + m_SizeDelta: {x: 30.003, y: 29.992} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8024669248513866792 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151432887577591654} + m_CullTransparentMesh: 1 +--- !u!114 &337482096340864640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151432887577591654} + 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 15 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 0 +--- !u!1 &167948134391169413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3111096710439815476} + - component: {fileID: 2921420103305436134} + - component: {fileID: 4970289695678040806} + m_Layer: 0 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3111096710439815476 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 167948134391169413} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000000059662} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7957164916501873808} + 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.012, y: -0.000000031044} + m_SizeDelta: {x: 30.003, y: 29.992} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2921420103305436134 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 167948134391169413} + m_CullTransparentMesh: 1 +--- !u!114 &4970289695678040806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 167948134391169413} + 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6BD2" +--- !u!1 &8664123997041071156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7957164916501873808} + - component: {fileID: 4202242118663527483} + - component: {fileID: 4992992949522583455} + m_Layer: 0 + m_Name: BuffIconInUIBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7957164916501873808 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8664123997041071156} + 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: 1 + m_Children: + - {fileID: 3111096710439815476} + - {fileID: 4255995714669253555} + 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_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4202242118663527483 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8664123997041071156} + m_CullTransparentMesh: 1 +--- !u!114 &4992992949522583455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8664123997041071156} + 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: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab.meta new file mode 100644 index 00000000..e4de2c62 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e32f8c4d372e9c44e95066b3ca04f9f1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01-PuTong.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01-PuTong.prefab index d79a697f..de23642d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01-PuTong.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01-PuTong.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.55, y: -0.95752} - m_SizeDelta: {x: 21.3, y: 208.29} + m_AnchoredPosition: {x: 3.4737, y: -0.6109} + m_SizeDelta: {x: 23.9852, y: 208.9832} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5103618545300337201 CanvasRenderer: @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -86738995, guid: 75572e58ac5d5384bbbdb79db67a03e5, type: 3} + m_Sprite: {fileID: -1846485671, guid: c531aa26b66654a4caae18840cb08744, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -107,11 +107,12 @@ RectTransform: m_Children: - {fileID: 843233974337841026} - {fileID: 5169657502601420430} + - {fileID: 4217468808005274720} m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -7, y: 2.1} + m_AnchoredPosition: {x: -7, y: 6.8} m_SizeDelta: {x: 17.977, y: 49.3483} m_Pivot: {x: 0, y: 0} --- !u!222 &7682921576911217389 @@ -135,7 +136,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 @@ -152,7 +153,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1743042268288407336 +--- !u!1 &2039739679404562467 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -160,50 +161,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3176423819686732705} - - component: {fileID: 7499988351518322326} - - component: {fileID: 5488668804733288573} + - component: {fileID: 4566785652062519403} + - component: {fileID: 2651732291482398786} + - component: {fileID: 413106947662935184} m_Layer: 5 - m_Name: DescriptionBackBoard + m_Name: Type m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3176423819686732705 +--- !u!224 &4566785652062519403 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1743042268288407336} + m_GameObject: {fileID: 2039739679404562467} 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: [] + m_Children: + - {fileID: 3151488523832167787} m_Father: {fileID: 4327911362163307378} 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.1527, y: -50.77} - m_SizeDelta: {x: 97.69, y: 91.58} + m_AnchoredPosition: {x: 0.8, y: -8.6} + m_SizeDelta: {x: 30.8653, y: 11.3759} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7499988351518322326 +--- !u!222 &2651732291482398786 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1743042268288407336} + m_GameObject: {fileID: 2039739679404562467} m_CullTransparentMesh: 1 ---- !u!114 &5488668804733288573 +--- !u!114 &413106947662935184 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1743042268288407336} + m_GameObject: {fileID: 2039739679404562467} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -211,13 +213,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -2127625255, guid: 1157d7960c3fe124b81605d8493a59ad, type: 3} + m_Sprite: {fileID: -937068834, guid: 2dbf308eaad54af4ca56e3b2d45f5de8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -261,7 +263,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.1527, y: -45.5} + m_AnchoredPosition: {x: -1.1527, y: -48} m_SizeDelta: {x: 89.549, y: 56.809} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &626272348365664036 @@ -306,6 +308,85 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u529B\u9053\u4E2D\u7B49\u7684\u666E\u901A\u653B\u51FB\uFF0C\u9020\u621010\u70B9\u4F24\u5BB3\u5E76\u5C06\u5468\u56F4\u4E09\u683C\u67D3\u8272" +--- !u!1 &3007399502127157345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3151488523832167787} + - component: {fileID: 3649451375300755549} + - component: {fileID: 8690087754950932840} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3151488523832167787 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3007399502127157345} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 4566785652062519403} + 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.000030756, y: 0.0000058413} + m_SizeDelta: {x: 61.731, y: 22.752} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3649451375300755549 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3007399502127157345} + m_CullTransparentMesh: 1 +--- !u!114 &8690087754950932840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3007399502127157345} + 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: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u653B\u51FB" --- !u!1 &3273413717179418248 GameObject: m_ObjectHideFlags: 0 @@ -341,7 +422,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -1.5999985, y: 2} + m_AnchoredPosition: {x: -1.5999908, y: 4.699997} m_SizeDelta: {x: 30, y: 32.64} m_Pivot: {x: 0, y: 1} --- !u!222 &184297988404096596 @@ -365,7 +446,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 @@ -425,8 +506,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 125, y: 200} + m_AnchoredPosition: {x: -3.1421, y: -1.1851} + m_SizeDelta: {x: 131.2842, y: 197.63} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &806089455888247474 CanvasRenderer: @@ -456,7 +537,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -434487570, guid: 78461e69b9e1eea4298f7afe36009d61, type: 3} + m_Sprite: {fileID: 2056361523, guid: 6ee9c76a053e25e498141299eb240f19, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -544,7 +625,7 @@ MonoBehaviour: speed: 4 moveOffset: 50 originPoint: {x: 0, y: 0, z: 0} - UpperOffset: {x: 0, y: 50, z: 0} + UpperOffset: {x: 0, y: 70, z: 0} originRotation: {x: 0, y: 0, z: 0} --- !u!1 &4434340823566726060 GameObject: @@ -572,16 +653,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4434340823566726060} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0000018025} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 4327911362163307378} + m_Father: {fileID: 159313098234297599} 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.1527, y: -0.000005722} - m_SizeDelta: {x: 95.387, y: 19.2492} + m_AnchoredPosition: {x: 63.9, y: 70.7} + m_SizeDelta: {x: 213.6473, y: 34.5352} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6521733443206888108 CanvasRenderer: @@ -613,7 +694,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 @@ -749,11 +830,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3176423819686732705} - {fileID: 452408839154702700} - - {fileID: 6256866880103788458} - - {fileID: 4217468808005274720} - {fileID: 8081187808729066129} + - {fileID: 4566785652062519403} m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -834,8 +913,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.000453, y: 5.1} - m_SizeDelta: {x: 125, y: 210.2} + m_AnchoredPosition: {x: -3.9493, y: 8.3232} + m_SizeDelta: {x: 144.5642, y: 216.6464} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6630524511444619868 CanvasRenderer: @@ -865,7 +944,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1463656039, guid: 9525da38382dd6f47acaf564721daf38, type: 3} + m_Sprite: {fileID: -86317797, guid: b9f08ba7ee791ea4ba1d5ccedcd162eb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -988,8 +1067,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: 47.1} - m_SizeDelta: {x: 100, y: 80.7449} + m_AnchoredPosition: {x: -0.6349, y: 50.6959} + m_SizeDelta: {x: 107.1578, y: 87.9367} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1664768320637620212 CanvasRenderer: @@ -1096,7 +1175,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 25 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -1108,81 +1187,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 1 ---- !u!1 &8039066695681990904 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6256866880103788458} - - component: {fileID: 1765883143212553492} - - component: {fileID: 3095710138702975603} - m_Layer: 5 - m_Name: MidBorder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6256866880103788458 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8039066695681990904} - 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: 4327911362163307378} - 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.00045794, y: -0} - m_SizeDelta: {x: 112.56, y: 18.58} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1765883143212553492 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8039066695681990904} - m_CullTransparentMesh: 1 ---- !u!114 &3095710138702975603 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8039066695681990904} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -911593896, guid: 798a6dfd54eab5f448f5639a5b6caee8, 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 &9064804669436731343 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01.prefab index e68c7e61..94a6a91a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01.prefab @@ -909,6 +909,7 @@ MonoBehaviour: m_EditorClassIdentifier: originalParent: {fileID: 0} originalpoint: {x: 0, y: 0, z: 0} + originalIndexInChild: 0 eventSystem: {fileID: 0} canUse: 1 ainPanle: {fileID: 1075869202937435496} @@ -951,7 +952,7 @@ MonoBehaviour: speed: 4 moveOffset: 50 originPoint: {x: 0, y: 0, z: 0} - UpperOffset: {x: 0, y: 50, z: 0} + UpperOffset: {x: 0, y: 70, z: 0} originRotation: {x: 0, y: 0, z: 0} --- !u!1 &3523919461092501418 GameObject: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/StepIcon.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/StepIcon.meta new file mode 100644 index 00000000..ad1f1463 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/StepIcon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25f170693f1e914498035ab67f458eb4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/StepIcon/Image.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/StepIcon/Image.prefab new file mode 100644 index 00000000..11d542b0 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/StepIcon/Image.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5159667013927544512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 104423353111018752} + - component: {fileID: 1579163591420326192} + - component: {fileID: 8813880691561153661} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &104423353111018752 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5159667013927544512} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1579163591420326192 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5159667013927544512} + m_CullTransparentMesh: 1 +--- !u!114 &8813880691561153661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5159667013927544512} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 364670974, guid: 0ef2ec730ef9df04e8276fb8e893a2ca, 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 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/StepIcon/Image.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/StepIcon/Image.prefab.meta new file mode 100644 index 00000000..4929f511 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/StepIcon/Image.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ca425697306c5a941b283345d04e8f26 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index aeae92db..07368c9b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -290,6 +290,106 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9b57ba76da093b84dad1f0100bb05537, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &14209048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 14209049} + - component: {fileID: 14209051} + - component: {fileID: 14209050} + - component: {fileID: 14209052} + m_Layer: 5 + m_Name: BuffPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &14209049 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14209048} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0000060144} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1143340466} + 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.3440304, y: -16.145016} + m_SizeDelta: {x: 195.19, y: 32.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &14209050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14209048} + 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: 0} + 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_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &14209051 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14209048} + m_CullTransparentMesh: 1 +--- !u!114 &14209052 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14209048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 15, y: 15} + m_Spacing: {x: 2, y: 2} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &60998406 GameObject: m_ObjectHideFlags: 0 @@ -1432,82 +1532,6 @@ SphereCollider: serializedVersion: 3 m_Radius: 0.45 m_Center: {x: 0, y: 0.41, z: -2} ---- !u!1 &193595742 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 193595743} - - component: {fileID: 193595745} - - component: {fileID: 193595744} - m_Layer: 5 - m_Name: HP (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &193595743 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 193595742} - 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: - - {fileID: 1072543140} - m_Father: {fileID: 1504140803} - 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: 26.629997, y: -142.73} - m_SizeDelta: {x: 195.19, y: 15.25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &193595744 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 193595742} - 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: 0, g: 0, b: 0, 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_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &193595745 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 193595742} - m_CullTransparentMesh: 1 --- !u!1 &196188495 GameObject: m_ObjectHideFlags: 0 @@ -1747,81 +1771,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b11a487f21e55274181e172db1955ef0, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &208811166 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 208811167} - - component: {fileID: 208811169} - - component: {fileID: 208811168} - m_Layer: 5 - m_Name: Image (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &208811167 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 208811166} - 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: 1975487182} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &208811168 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 208811166} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 364670974, guid: 0ef2ec730ef9df04e8276fb8e893a2ca, 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!222 &208811169 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 208811166} - m_CullTransparentMesh: 1 --- !u!1 &216708359 GameObject: m_ObjectHideFlags: 0 @@ -2718,7 +2667,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 365854624} 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: [] @@ -2726,7 +2675,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.116, y: -0.21} + m_AnchoredPosition: {x: -0.116, y: -0.231} m_SizeDelta: {x: 0.9286, y: 0.1142} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &365854626 @@ -3304,7 +3253,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 442538737} m_CullTransparentMesh: 1 ---- !u!1 &443552856 +--- !u!1 &449271697 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3312,119 +3261,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 443552857} - - component: {fileID: 443552859} - - component: {fileID: 443552858} - m_Layer: 5 - m_Name: Image + - component: {fileID: 449271698} + - component: {fileID: 449271699} + m_Layer: 0 + m_Name: CardId m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &443552857 -RectTransform: +--- !u!4 &449271698 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 443552856} + m_GameObject: {fileID: 449271697} + serializedVersion: 2 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: 1748859174} + m_Father: {fileID: 952604643} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &443552858 +--- !u!114 &449271699 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 443552856} + m_GameObject: {fileID: 449271697} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: dd47d524a21ce034a8e48a5a1f8cc26f, 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &443552859 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 443552856} - m_CullTransparentMesh: 1 ---- !u!1 &449271697 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 449271698} - - component: {fileID: 449271699} - m_Layer: 0 - m_Name: CardId - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &449271698 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 449271697} - serializedVersion: 2 - 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: 952604643} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &449271699 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 449271697} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dd47d524a21ce034a8e48a5a1f8cc26f, type: 3} - m_Name: - m_EditorClassIdentifier: - attack: 10001 ---- !u!1 &467535681 + attack: 10001 +--- !u!1 &467535681 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4044,6 +3918,10 @@ MonoBehaviour: buffIconList: [] buffPanle: {fileID: 365854624} buffIcon: {fileID: 610775712955856159, guid: 457a3d2dee855fa41a324600bf63e57f, type: 3} + buffIconListInPlayerPanel: [] + buffPanleInPlayerPanel: {fileID: 14209048} + buffIconInPlayerPanel: {fileID: 8664123997041071156, guid: e32f8c4d372e9c44e95066b3ca04f9f1, + type: 3} damagemultiply: 0 firm: 0 drawNubmerMultiply: 0 @@ -4340,16 +4218,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 560113992} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000000031488} - m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + 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: 1302517661} 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.000019997358} - m_SizeDelta: {x: 23.37, y: 20.556} + m_AnchoredPosition: {x: 0, y: -0} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &560113994 MonoBehaviour: @@ -4364,7 +4242,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 @@ -4373,7 +4251,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 15 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -4693,7 +4571,6 @@ RectTransform: - {fileID: 471985938} - {fileID: 816979501} - {fileID: 1225743231} - - {fileID: 675152058} m_Father: {fileID: 197216736} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -4770,12 +4647,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 743691081} - m_Father: {fileID: 1504140803} + m_Father: {fileID: 1143340466} 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: 26.629997, y: -113.03} - m_SizeDelta: {x: 195.19, y: 14.9} + m_AnchoredPosition: {x: -2.5525, y: 15.34} + m_SizeDelta: {x: 218.18, y: 24.68} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &669923023 MonoBehaviour: @@ -4790,14 +4667,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0} 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: 1255180889, guid: fe1c308de7c89bc42a3777bfc18c8524, type: 3} + m_Sprite: {fileID: 66097935, guid: c533039d3f4423d4cb5b985cb53597fb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4969,126 +4846,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 674342469} m_CullTransparentMesh: 1 ---- !u!1 &675152057 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 675152058} - - component: {fileID: 675152061} - - component: {fileID: 675152060} - - component: {fileID: 675152059} - m_Layer: 5 - m_Name: 'HomeButton ' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &675152058 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 675152057} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000029812} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 637486498} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -152.3, y: 0} - m_SizeDelta: {x: 26.740005, y: 28.59} - m_Pivot: {x: 1, y: 0.5} ---- !u!114 &675152059 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 675152057} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 675152060} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &675152060 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 675152057} - 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: 1980176404, guid: 4b40c00ef07020942b6a0b3dd86aaf0d, 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!222 &675152061 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 675152057} - m_CullTransparentMesh: 1 --- !u!1 &678393339 GameObject: m_ObjectHideFlags: 0 @@ -5299,7 +5056,7 @@ GameObject: - component: {fileID: 742474146} - component: {fileID: 742474145} m_Layer: 5 - m_Name: Text (Legacy) + m_Name: playerNameText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5357,7 +5114,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u4E3B\u83DC\u5355" + m_Text: Name --- !u!222 &742474146 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5416,14 +5173,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.3226415, b: 0.3226415, 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: 21300000, guid: 06846d39b2c9e8f40941c43d5e290f19, type: 3} + m_Sprite: {fileID: 66097935, guid: c533039d3f4423d4cb5b985cb53597fb, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5797,7 +5554,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &806364677 RectTransform: m_ObjectHideFlags: 0 @@ -5814,7 +5571,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.067, y: -0.062} + m_AnchoredPosition: {x: 0.326, y: -0.086} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &806364678 @@ -5830,7 +5587,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: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 @@ -5839,12 +5596,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 25 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 51 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -6718,7 +6475,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &932865025 RectTransform: m_ObjectHideFlags: 0 @@ -6726,16 +6483,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 932865024} - m_LocalRotation: {x: -0.000003546476, y: -0.0000015385447, z: 0.26806816, w: -0.9634} - m_LocalPosition: {x: 0, y: 0, z: 0} + 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: 1954493344} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -31.099} + 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_AnchoredPosition: {x: 0.156, y: -0.086} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &932865026 @@ -6751,7 +6508,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: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 @@ -6760,7 +6517,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 45 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -7183,7 +6940,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1009332616} - m_LocalRotation: {x: 0.000001817942, y: -0.000000015366826, z: 0.010216468, w: 0.99994785} + 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 @@ -7192,11 +6949,11 @@ RectTransform: - {fileID: 1818977955} - {fileID: 2096369104} m_Father: {fileID: 1504140803} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 1.171} + 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: 188.5, y: -15.100021} - m_SizeDelta: {x: 80, y: 80} + m_AnchoredPosition: {x: 185.5, y: -8.600006} + m_SizeDelta: {x: 80, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1009332618 MonoBehaviour: @@ -7218,7 +6975,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 290022622, guid: 16ae439c29f1a134b87db29ac0811e9f, type: 3} + m_Sprite: {fileID: 1978882971, guid: bd3849e15fd6a4d4b8d841d38a318f1b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7509,156 +7266,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051341099} m_CullTransparentMesh: 1 ---- !u!1 &1059792473 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1059792474} - - component: {fileID: 1059792476} - - component: {fileID: 1059792475} - m_Layer: 5 - m_Name: Image (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1059792474 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1059792473} - 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: 1975487182} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1059792475 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1059792473} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 364670974, guid: 0ef2ec730ef9df04e8276fb8e893a2ca, 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!222 &1059792476 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1059792473} - m_CullTransparentMesh: 1 ---- !u!1 &1072543139 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1072543140} - - component: {fileID: 1072543142} - - component: {fileID: 1072543141} - m_Layer: 5 - m_Name: HPBar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1072543140 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1072543139} - 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: 193595743} - 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.5000305} - m_SizeDelta: {x: 0, y: 1} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1072543141 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1072543139} - 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: 0.128649, g: 0.5566038, b: 0.38879523, 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: 21300000, guid: 06846d39b2c9e8f40941c43d5e290f19, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1072543142 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1072543139} - m_CullTransparentMesh: 1 --- !u!1 &1075475867 GameObject: m_ObjectHideFlags: 0 @@ -7948,83 +7555,160 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1140853216} - - component: {fileID: 1140853219} - - component: {fileID: 1140853218} - - component: {fileID: 1140853217} - m_Layer: 0 - m_Name: ChooseCardBar + - component: {fileID: 1140853216} + - component: {fileID: 1140853219} + - component: {fileID: 1140853218} + - component: {fileID: 1140853217} + m_Layer: 0 + m_Name: ChooseCardBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1140853216 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140853215} + 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: + - {fileID: 674342470} + m_Father: {fileID: 1373007395} + 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.0097885, y: 48} + m_SizeDelta: {x: 1064.0371, y: 433.0281} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1140853217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140853215} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 40 + m_Right: 0 + m_Top: 25 + 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_Constraint: 0 + m_ConstraintCount: 2 +--- !u!114 &1140853218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140853215} + 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: 0} + 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_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1140853219 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140853215} + m_CullTransparentMesh: 1 +--- !u!1 &1143340465 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1143340466} + - component: {fileID: 1143340468} + - component: {fileID: 1143340467} + m_Layer: 5 + m_Name: Under m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1140853216 +--- !u!224 &1143340466 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140853215} + m_GameObject: {fileID: 1143340465} 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: - - {fileID: 674342470} - m_Father: {fileID: 1373007395} + - {fileID: 669923022} + - {fileID: 14209049} + m_Father: {fileID: 1504140803} 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.0097885, y: 48} - m_SizeDelta: {x: 1064.0371, y: 433.0281} + m_AnchoredPosition: {x: 28.975006, y: -129.21} + m_SizeDelta: {x: 223.29, y: 64.59} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1140853217 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140853215} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 40 - m_Right: 0 - m_Top: 25 - 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_Constraint: 0 - m_ConstraintCount: 2 ---- !u!114 &1140853218 +--- !u!114 &1143340467 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140853215} + m_GameObject: {fileID: 1143340465} 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: 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -111712975, guid: e54f453aebb65db41a43212eed19d105, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8033,13 +7717,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1140853219 +--- !u!222 &1143340468 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140853215} + m_GameObject: {fileID: 1143340465} m_CullTransparentMesh: 1 --- !u!1 &1147870382 GameObject: @@ -8119,8 +7803,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: 28.975006, y: 2} - m_SizeDelta: {x: 257.14, y: 327.01} + m_AnchoredPosition: {x: 29.709991, y: -9.889999} + m_SizeDelta: {x: 201.39, y: 269.86} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1161542571 MonoBehaviour: @@ -8142,7 +7826,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -139482480, guid: 3b78631c43671704d81a8d876c3645bb, type: 3} + m_Sprite: {fileID: -313539309, guid: d2a1db5217bc90f44aead19672b99969, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8720,7 +8404,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 186.20001, y: -95.1} - m_SizeDelta: {x: 80, y: 80} + m_SizeDelta: {x: 80, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1242608530 MonoBehaviour: @@ -8742,7 +8426,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1777836165, guid: f5db134002615c34dacf25951ff55e9b, type: 3} + m_Sprite: {fileID: 1688620508, guid: bd3849e15fd6a4d4b8d841d38a318f1b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9156,6 +8840,7 @@ MonoBehaviour: textCurrentStep: {fileID: 223587226} textShieldValue: {fileID: 197140187} HpBar: {fileID: 743691082} + playerHPinUpUI: {fileID: 1528011285} playerBoundary: 4 enemyBoundary: 7 playerColourCountText: {fileID: 1833978459} @@ -9389,7 +9074,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1302517661 RectTransform: m_ObjectHideFlags: 0 @@ -9398,7 +9083,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1302517660} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00000008344651} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -9407,7 +9092,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -0.00000011920929, y: 0} + m_AnchoredPosition: {x: -1.135, y: -0.04} m_SizeDelta: {x: 0.2337, y: 0.2056} m_Pivot: {x: 1, y: 0} --- !u!114 &1302517662 @@ -9423,7 +9108,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 @@ -9854,81 +9539,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1381967974} m_CullTransparentMesh: 1 ---- !u!1 &1424700709 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1424700710} - - component: {fileID: 1424700712} - - component: {fileID: 1424700711} - m_Layer: 5 - m_Name: Image (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1424700710 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1424700709} - 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: 1748859174} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1424700711 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1424700709} - 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1424700712 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1424700709} - m_CullTransparentMesh: 1 --- !u!1 &1433470489 GameObject: m_ObjectHideFlags: 0 @@ -10390,11 +10000,11 @@ RectTransform: m_Children: - {fileID: 1161542570} - {fileID: 2060702281} - - {fileID: 669923022} - - {fileID: 193595743} - {fileID: 1501760642} - {fileID: 1009332617} - {fileID: 1242608529} + - {fileID: 1518425767} + - {fileID: 1143340466} m_Father: {fileID: 846544929} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -10583,6 +10193,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1515175091} m_CullTransparentMesh: 1 +--- !u!1 &1518425766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1518425767} + - component: {fileID: 1518425769} + - component: {fileID: 1518425768} + m_Layer: 5 + m_Name: PlayerIconEdge + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1518425767 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1518425766} + 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: 1504140803} + 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: 28.959991, y: 13} + m_SizeDelta: {x: 248.12, y: 305.01} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1518425768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1518425766} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1372590706, guid: aac0a91643cf9504fa98e1cc2ffe24b3, 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!222 &1518425769 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1518425766} + m_CullTransparentMesh: 1 --- !u!1 &1528011283 GameObject: m_ObjectHideFlags: 0 @@ -10754,7 +10439,7 @@ GameObject: - component: {fileID: 1549458910} - component: {fileID: 1549458909} m_Layer: 5 - m_Name: MenuMuneButton + m_Name: playerNameText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -10787,7 +10472,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1549458907} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: @@ -11487,81 +11172,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1654169117 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1654169118} - - component: {fileID: 1654169120} - - component: {fileID: 1654169119} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1654169118 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1654169117} - 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: 1975487182} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1654169119 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1654169117} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 364670974, guid: 0ef2ec730ef9df04e8276fb8e893a2ca, 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!222 &1654169120 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1654169117} - m_CullTransparentMesh: 1 --- !u!1 &1666980275 GameObject: m_ObjectHideFlags: 0 @@ -12053,9 +11663,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: -0.000011104} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 443552857} - - {fileID: 1424700710} + m_Children: [] m_Father: {fileID: 197216736} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -12590,6 +12198,7 @@ MonoBehaviour: type: 3} locationX: 4 locationY: 5 + playerNameText: {fileID: 742474145} --- !u!4 &1802141879 Transform: m_ObjectHideFlags: 0 @@ -12739,6 +12348,10 @@ MonoBehaviour: movePath: [] anim: {fileID: 60998408} speed: 2 + stepIconCount: -1 + StepIconFather: {fileID: 1975487182} + stepIconPrefab: {fileID: 5159667013927544512, guid: ca425697306c5a941b283345d04e8f26, + type: 3} --- !u!1 &1817435585 GameObject: m_ObjectHideFlags: 0 @@ -13352,7 +12965,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1954493343} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000000031119} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -13363,7 +12976,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -0.3, y: 0} + m_AnchoredPosition: {x: 0.19300002, y: -0.003999993} m_SizeDelta: {x: 0.3, y: 0.3} m_Pivot: {x: 0, y: 0} --- !u!114 &1954493345 @@ -13480,7 +13093,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1974423746} m_LocalRotation: {x: 0.49568623, y: 0.0018411455, z: -0.00053976575, w: 0.8684996} - m_LocalPosition: {x: 0, y: 0, z: -0.406} + m_LocalPosition: {x: 0, y: 0, z: -0.357} m_LocalScale: {x: 1.4285715, y: 1.4285712, z: 1.4285713} m_ConstrainProportionsScale: 0 m_Children: @@ -13492,7 +13105,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.159, y: -0.257} + m_AnchoredPosition: {x: 0.159, y: -0.228} m_SizeDelta: {x: 1.1641, y: 0.2986} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1974423748 @@ -13605,10 +13218,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1654169118} - - {fileID: 208811167} - - {fileID: 1059792474} + m_Children: [] m_Father: {fileID: 1750187012} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -13637,7 +13247,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 0.1, y: 0.3} - m_Spacing: {x: 0, y: 0} + m_Spacing: {x: 0.02, y: 0} m_Constraint: 0 m_ConstraintCount: 2 --- !u!114 &1975487184 @@ -14273,7 +13883,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.071, y: -0.085} + m_AnchoredPosition: {x: -0.026, y: -0.085} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2083389424 @@ -14303,7 +13913,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 51 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOnMouseEnter.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOnMouseEnter.cs index d92cb2af..32b75591 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOnMouseEnter.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOnMouseEnter.cs @@ -66,8 +66,10 @@ public class CardOnMouseEnter : MonoBehaviour, IPointerEnterHandler, IPointerExi } IEnumerator ZoomBig() - { - transform.localPosition += UpperOffset; + { + float upperOffsetRevise = CardActiveSort.Instance.radius * (1f - Mathf.Cos(originRotation.z * Mathf.Deg2Rad)); + transform.localPosition += (UpperOffset + new Vector3(0f, upperOffsetRevise, 0f)); + Debug.Log(UpperOffset + new Vector3(0f, upperOffsetRevise, 0f)+"\\\\"+ originRotation.z); OffsetOtherCard(oringinIndex); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs index 4df79918..02609a93 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs @@ -16,6 +16,11 @@ public class CardOriginalDataList : Singleton public Dictionary legendaryCardOriginalDataList = new Dictionary(); + [Header("卡牌类型图片")] + public Sprite shoot; + public Sprite attack; + public Sprite world; + public Sprite role; private void OnEnable() { @@ -25,6 +30,23 @@ public class CardOriginalDataList : Singleton } + public void SetUpCardFlyTypeIcon(Sprite sprite , int type) + { + switch (type) + { + case 1: + sprite = shoot; + break; + case 2: + sprite = attack; + break; + case 3: + sprite = role; + break; + } + + } + public HashSet GetCardRewards(int count) { double rareCardCount = 0; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs index 6598ac9c..f653902d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs @@ -31,6 +31,9 @@ public class GameManager : Singleton public Image HpBar; + //顶边UI显示玩家血量 + public Text playerHPinUpUI; + [Header("场地颜色个数UI")] public int playerBoundary;//开局场地分界 public int enemyBoundary;//场地分界 @@ -95,7 +98,26 @@ public class GameManager : Singleton textCurrentStep.text = playerState.currentStepRange.ToString(); // textShieldValue.text = playerState.currentShieldValue.ToString(); textShieldValue.text = Usermanager.Instance.shield.ToString(); + HpBar.fillAmount = playerState.currentHP / playerState.maxHP; + playerHPinUpUI .text = playerState.currentHP .ToString ()+"/"+ playerState.maxHP.ToString (); + + //同步步数UI标识 + if(playerState .currentStepRange != player .stepIconCount ) + { + for(int i= player.StepIconFather.childCount-1; i>=0;i--) + { + Destroy(player.StepIconFather.GetChild(i).gameObject); + } + player.stepIconCount = playerState.currentStepRange; + + for (int i = 0; i < player.stepIconCount; i++) + { + Instantiate(player.stepIconPrefab, player.StepIconFather); + } + + } + } //统计场地颜色 @@ -105,6 +127,7 @@ public class GameManager : Singleton float playerCount = 0; float enemyCount = 0; float totalCount = 0; + float totalColoerCount = 0; for (int i = 0; i < X.Count; i++) { @@ -122,11 +145,12 @@ public class GameManager : Singleton } } + totalColoerCount = playerCount + enemyCount; //同步UI playerColourCountText.text = playerCount.ToString(); enemyColourCountText.text = enemyCount.ToString(); - playerColourCountBar.fillAmount = playerCount / totalCount; - enemyColourCountBar.fillAmount = enemyCount / totalCount; + playerColourCountBar.fillAmount = playerCount / totalColoerCount ; + enemyColourCountBar.fillAmount = enemyCount / totalColoerCount; if (playerCount > enemyCount) { result = true; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs index 08387657..221138c2 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; using static GameManager; public class MapManager : Singleton @@ -20,10 +21,19 @@ public class MapManager : Singleton [Header("敌人")] public List enemyGenerateDataList = new List(); + [Header("一次性注册信息")] + public Text playerNameText; + void Start() { StartCoroutine (starttest()); - + + SetUpScenceInfor(); + } + //设置场景加载的一次性信息：玩家名字 + public void SetUpScenceInfor() + { + playerNameText .text = GameManager.Instance.playerState.playerName; } public void test() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs index 3f72b9d7..75eda7e2 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs @@ -19,6 +19,11 @@ public class Player : MonoBehaviour [Header("跑步速度")] public float speed =2; + [Header("步数标识个数集（UI）")] + public int stepIconCount; + public Transform StepIconFather; + public GameObject stepIconPrefab; + private void Start() { // Invoke("StartPlayer", 4f); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/PlayerState_SO.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/PlayerState_SO.cs index 3c4a35e5..22bc5cc8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/PlayerState_SO.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/PlayerState_SO.cs @@ -7,6 +7,7 @@ using UnityEngine; public class PlayerState_SO : ScriptableObject { + public string playerName; public int maxStepRange;//步数 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs index abdfa1f3..b3aea6fc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs @@ -20,9 +20,14 @@ public class Usermanager : Singleton public List buffSettleList = new List();//回合结束时结算 [Header("Buff状态UI组件")] + //角色身上 public List buffIconList = new List(); public GameObject buffPanle; public GameObject buffIcon; + //底边UI + public List buffIconListInPlayerPanel = new List(); + public GameObject buffPanleInPlayerPanel; + public GameObject buffIconInPlayerPanel; [Header("Buff状增益参数")] //伤害比率 @@ -412,6 +417,7 @@ public class Usermanager : Singleton //异常Buff显示 public void RefreshPlayerBuffIcon() { + //角色身上 //先清空 foreach (var icon in buffIconList) { @@ -430,6 +436,25 @@ public class Usermanager : Singleton } } + + //底边栏 + foreach (var icon in buffIconListInPlayerPanel ) + { + Destroy(icon); + } + buffIconListInPlayerPanel.Clear(); + + //再刷新 + foreach (var key in playerAbnormalCondition.Keys.ToList()) + { + if (playerAbnormalCondition[key].value != 0) + { + var buff = Instantiate(buffIconInPlayerPanel, buffPanleInPlayerPanel .transform); + playerAbnormalCondition[key].UIShow(buff, key); + buffIconListInPlayerPanel.Add(buff); + } + + } } public void SufferTrueDamage(int damage) {