diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI.meta new file mode 100644 index 00000000..b6c09157 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c0e41d9daeae604183b4fc16f282d75 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/差不多这样.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/差不多这样.png new file mode 100644 index 00000000..7002d23a Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/差不多这样.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/差不多这样.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/差不多这样.png.meta new file mode 100644 index 00000000..ea87a52c --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/差不多这样.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 490b59a9991918d4c9a9fec030aa6730 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_场景.jpg b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_场景.jpg new file mode 100644 index 00000000..d1810dd2 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_场景.jpg differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_场景.jpg.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_场景.jpg.meta new file mode 100644 index 00000000..4c18159b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_场景.jpg.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 4645ab89a22e03040b61b5552adf6a4a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_底板.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_底板.png new file mode 100644 index 00000000..cdc846e2 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_底板.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_底板.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_底板.png.meta new file mode 100644 index 00000000..7c90c252 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_底板.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 7f9428669aae505459e976a8182c7c53 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_按钮_01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_按钮_01.png new file mode 100644 index 00000000..40e59626 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_按钮_01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_按钮_01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_按钮_01.png.meta new file mode 100644 index 00000000..5d61ca06 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_按钮_01.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: e3fafd47d4a57964c93eec4dd1bc20d7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: "\u953B\u9020_\u6309\u94AE_01_0" + rect: + serializedVersion: 2 + x: 38 + y: 44 + width: 740 + height: 305 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 88, y: 74, z: 95, w: 95} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 96239c279c4cb674d80e3b9e88004d51 + internalID: -128003227 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u953B\u9020_\u6309\u94AE_01_0": -128003227 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_按钮_02.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_按钮_02.png new file mode 100644 index 00000000..52bc3ec9 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_按钮_02.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_按钮_02.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_按钮_02.png.meta new file mode 100644 index 00000000..92b4fe78 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_按钮_02.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: ce75a63e1dc9d6646a618e57e219be4a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 226, y: 225, z: 233, w: 217} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_条_01.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_条_01.png new file mode 100644 index 00000000..f483a72e Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_条_01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_条_01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_条_01.png.meta new file mode 100644 index 00000000..8cfe1316 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_条_01.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 47c71ff66187d0244b9812a1e0b01bc0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_条_02.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_条_02.png new file mode 100644 index 00000000..b5ea2260 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_条_02.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_条_02.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_条_02.png.meta new file mode 100644 index 00000000..7147839c --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_条_02.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: b37bc64881e17af4687851e8ad521366 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_烟雾.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_烟雾.png new file mode 100644 index 00000000..68f42ba2 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_烟雾.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_烟雾.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_烟雾.png.meta new file mode 100644 index 00000000..12290a45 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/0522_UI/锻造_烟雾.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: e682776ca11c40147a205c265887f9d8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset index b8a256fd..5e13b07f 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset @@ -12,16 +12,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23280c7f867c4ca468ab73909d4f7707, type: 3} m_Name: LevelState_1 m_EditorClassIdentifier: - levelStep: 3 + levelStep: 14 mapLevel: 1 - currentPoint: {x: 2, y: 0} + currentPoint: {x: 13, y: 1} levelSaveMap: - levelDataList: - roomType: 13 - roomSprite: {fileID: 21300000, guid: ff32fb1659a153e42a94662fdb5b6066, type: 3} + roomSprite: {fileID: 21300000, guid: 51ed530cecfde27469b2a5d3a320b3ce, type: 3} isUse: 0 passBy: 0 - nodePos: {x: -8.1901, y: 0.05970478, z: -7.539102} + nodePos: {x: -8.579113, y: 0.05970955, z: -8.949104} line: 0 column: 0 roomDestinationIndex: 16 @@ -34,10 +34,10 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 13 - roomSprite: {fileID: 21300000, guid: ff32fb1659a153e42a94662fdb5b6066, type: 3} + roomSprite: {fileID: 21300000, guid: 51ed530cecfde27469b2a5d3a320b3ce, type: 3} isUse: 1 passBy: 0 - nodePos: {x: -8.190107, y: 0.059706688, z: -6.4391036} + nodePos: {x: -8.579121, y: 0.05970955, z: -6.449104} line: 0 column: 1 roomDestinationIndex: 16 @@ -51,10 +51,10 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 13 - roomSprite: {fileID: 21300000, guid: ff32fb1659a153e42a94662fdb5b6066, type: 3} + roomSprite: {fileID: 21300000, guid: 51ed530cecfde27469b2a5d3a320b3ce, type: 3} isUse: 0 passBy: 0 - nodePos: {x: -8.190113, y: 0.059708595, z: -5.339105} + nodePos: {x: -8.579128, y: 0.059711456, z: -3.9491057} line: 0 column: 2 roomDestinationIndex: 16 @@ -68,10 +68,10 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 0 passBy: 0 - nodePos: {x: -5.99012, y: 0.05971241, z: -7.539103} + nodePos: {x: -6.579136, y: 0.059720993, z: -8.949106} line: 1 column: 0 roomDestinationIndex: 2 @@ -79,17 +79,17 @@ MonoBehaviour: nextLevelNodes: [] fightEenemyPool: weak enemyList: - - 4007 - - 4008 + - RatWarrior + - Pharmacist extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 1 passBy: 1 - nodePos: {x: -5.9901237, y: 0.059714317, z: -6.4391055} + nodePos: {x: -6.5791397, y: 0.059720993, z: -6.4491067} line: 1 column: 1 roomDestinationIndex: 2 @@ -101,18 +101,17 @@ MonoBehaviour: - {x: 2, y: 2} fightEenemyPool: weak enemyList: - - 4007 - - 4008 - - 4008 + - RatWarrior + - Pharmacist extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 0 passBy: 0 - nodePos: {x: -5.9901257, y: 0.059716225, z: -5.339107} + nodePos: {x: -6.5791416, y: 0.0597229, z: -3.9491105} line: 1 column: 2 roomDestinationIndex: 2 @@ -120,22 +119,21 @@ MonoBehaviour: nextLevelNodes: [] fightEenemyPool: weak enemyList: - - 4007 - - 4008 - - 4008 + - Gravitus + - RatWarrior extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 12 - roomSprite: {fileID: 21300000, guid: 99d6cfcd8d628454989abc09534f0b64, type: 3} + - roomType: 4 + roomSprite: {fileID: 21300000, guid: e2a576b37ecc9ee4a92a1595d55eeb41, type: 3} isUse: 1 - passBy: 1 - nodePos: {x: -3.7901325, y: 0.05972004, z: -7.539102} + passBy: 0 + nodePos: {x: -4.5791492, y: 0.059732437, z: -8.949108} line: 2 column: 0 - roomDestinationIndex: 15 + roomDestinationIndex: 4 fatherLevelNodes: - {x: 1, y: 1} nextLevelNodes: @@ -146,14 +144,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 6 - roomSprite: {fileID: -687936468, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + - roomType: 9 + roomSprite: {fileID: 21300000, guid: e1cef9e8ec9cfc14e923f6d03f19f7af, type: 3} isUse: 1 - passBy: 0 - nodePos: {x: -3.7901382, y: 0.059721947, z: -6.4391065} + passBy: 1 + nodePos: {x: -4.579153, y: 0.059732437, z: -6.4491076} line: 2 column: 1 - roomDestinationIndex: 3 + roomDestinationIndex: 12 fatherLevelNodes: - {x: 1, y: 1} nextLevelNodes: @@ -164,14 +162,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 4 - roomSprite: {fileID: 865446097, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + - roomType: 6 + roomSprite: {fileID: 21300000, guid: dc3014f38b95b24448577e14bee06967, type: 3} isUse: 1 passBy: 0 - nodePos: {x: -3.7901402, y: 0.059723854, z: -5.339107} + nodePos: {x: -4.579157, y: 0.059734344, z: -3.9491096} line: 2 column: 2 - roomDestinationIndex: 4 + roomDestinationIndex: 3 fatherLevelNodes: - {x: 1, y: 1} nextLevelNodes: @@ -184,10 +182,10 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 1 passBy: 0 - nodePos: {x: -1.5901484, y: 0.05972767, z: -7.539104} + nodePos: {x: -2.5791645, y: 0.05974388, z: -8.949106} line: 3 column: 0 roomDestinationIndex: 2 @@ -196,17 +194,17 @@ MonoBehaviour: - {x: 4, y: 0} fightEenemyPool: weak enemyList: - - 4007 - - 4008 + - LivingArmor + - FailedSample extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 1 - passBy: 0 - nodePos: {x: -1.5901523, y: 0.059729576, z: -6.4391055} + passBy: 1 + nodePos: {x: -2.5791678, y: 0.05974388, z: -6.4491057} line: 3 column: 1 roomDestinationIndex: 2 @@ -215,18 +213,17 @@ MonoBehaviour: - {x: 4, y: 1} fightEenemyPool: weak enemyList: - - 4003 - - 4003 - - 4004 + - RatWarrior + - Pharmacist extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 1 passBy: 0 - nodePos: {x: -1.5901561, y: 0.059731483, z: -5.339107} + nodePos: {x: -2.5791707, y: 0.05974579, z: -3.9491086} line: 3 column: 2 roomDestinationIndex: 2 @@ -235,22 +232,21 @@ MonoBehaviour: - {x: 4, y: 2} fightEenemyPool: weak enemyList: - - 4007 - - 4008 - - 4008 + - RatWarrior + - Pharmacist extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 9 - roomSprite: {fileID: 21300000, guid: 2b6cbc9fb953ffc4eb02968e26d8f0cb, type: 3} + - roomType: 10 + roomSprite: {fileID: 21300000, guid: 4bba0a3acc15faf4a8b904c7c0a781e2, type: 3} isUse: 1 passBy: 0 - nodePos: {x: 0.6098423, y: 0.0597353, z: -7.539102} + nodePos: {x: -0.57917356, y: 0.059755325, z: -8.949106} line: 4 column: 0 - roomDestinationIndex: 12 + roomDestinationIndex: 11 fatherLevelNodes: - {x: 3, y: 0} nextLevelNodes: @@ -261,14 +257,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 11 - roomSprite: {fileID: 21300000, guid: 00234b60ba12993428c782adbed08140, type: 3} + - roomType: 8 + roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3} isUse: 1 - passBy: 0 - nodePos: {x: 0.6098404, y: 0.059737206, z: -6.4391055} + passBy: 1 + nodePos: {x: -0.57917595, y: 0.059755325, z: -6.4491076} line: 4 column: 1 - roomDestinationIndex: 13 + roomDestinationIndex: 9 fatherLevelNodes: - {x: 3, y: 1} nextLevelNodes: @@ -279,14 +275,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 11 - roomSprite: {fileID: 21300000, guid: 00234b60ba12993428c782adbed08140, type: 3} + - roomType: 9 + roomSprite: {fileID: 21300000, guid: e1cef9e8ec9cfc14e923f6d03f19f7af, type: 3} isUse: 1 passBy: 0 - nodePos: {x: 0.60983753, y: 0.059739113, z: -5.339106} + nodePos: {x: -0.57917786, y: 0.059757233, z: -3.9491086} line: 4 column: 2 - roomDestinationIndex: 13 + roomDestinationIndex: 12 fatherLevelNodes: - {x: 3, y: 2} nextLevelNodes: @@ -299,10 +295,10 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 7 - roomSprite: {fileID: 558621461, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: 8948f133a8665e14c8f6329ebdd19abb, type: 3} isUse: 0 passBy: 0 - nodePos: {x: 2.809836, y: 0.059742928, z: -7.539102} + nodePos: {x: 1.4208183, y: 0.05976677, z: -8.949108} line: 5 column: 0 roomDestinationIndex: 10 @@ -315,10 +311,10 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 7 - roomSprite: {fileID: 558621461, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: 8948f133a8665e14c8f6329ebdd19abb, type: 3} isUse: 1 - passBy: 0 - nodePos: {x: 2.8098352, y: 0.059744835, z: -6.4391036} + passBy: 1 + nodePos: {x: 1.4208169, y: 0.05976677, z: -6.4491076} line: 5 column: 1 roomDestinationIndex: 10 @@ -335,10 +331,10 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 7 - roomSprite: {fileID: 558621461, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: 8948f133a8665e14c8f6329ebdd19abb, type: 3} isUse: 0 passBy: 0 - nodePos: {x: 2.8098352, y: 0.059746742, z: -5.339105} + nodePos: {x: 1.4208152, y: 0.059768677, z: -3.9491096} line: 5 column: 2 roomDestinationIndex: 10 @@ -352,10 +348,10 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 0 passBy: 0 - nodePos: {x: 5.0098357, y: 0.059750557, z: -7.5391} + nodePos: {x: 3.4208136, y: 0.059778214, z: -8.949106} line: 6 column: 0 roomDestinationIndex: 2 @@ -363,17 +359,17 @@ MonoBehaviour: nextLevelNodes: [] fightEenemyPool: strong enemyList: - - 4017 - - 4018 + - Thief + - PrismReflector extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 1 - passBy: 0 - nodePos: {x: 5.0098357, y: 0.059752464, z: -6.4391055} + passBy: 1 + nodePos: {x: 3.4208128, y: 0.059778214, z: -6.4491067} line: 6 column: 1 roomDestinationIndex: 2 @@ -385,17 +381,17 @@ MonoBehaviour: - {x: 7, y: 2} fightEenemyPool: strong enemyList: - - 4017 - - 4018 + - PollutionSpreader + - Gravitus extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 0 passBy: 0 - nodePos: {x: 5.0098357, y: 0.05975437, z: -5.339107} + nodePos: {x: 3.4208117, y: 0.05978012, z: -3.9491086} line: 6 column: 2 roomDestinationIndex: 2 @@ -403,21 +399,21 @@ MonoBehaviour: nextLevelNodes: [] fightEenemyPool: strong enemyList: - - 4017 - - 4018 + - PollutionSpreader + - Gravitus extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 10 - roomSprite: {fileID: 21300000, guid: a8b50b2b4dd2d3b429b213be2a984e0b, type: 3} + - roomType: 11 + roomSprite: {fileID: 21300000, guid: 5edbcfc45fbb4b2428e4f2782201afad, type: 3} isUse: 1 passBy: 0 - nodePos: {x: 7.2098393, y: 0.059758186, z: -7.539102} + nodePos: {x: 5.420813, y: 0.059789658, z: -8.949108} line: 7 column: 0 - roomDestinationIndex: 11 + roomDestinationIndex: 13 fatherLevelNodes: - {x: 6, y: 1} nextLevelNodes: @@ -428,14 +424,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 8 - roomSprite: {fileID: 21300000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} + - roomType: 12 + roomSprite: {fileID: 21300000, guid: 6b27bdf9c297a274f95e945a248a7668, type: 3} isUse: 1 passBy: 0 - nodePos: {x: 7.20984, y: 0.059760094, z: -6.4391065} + nodePos: {x: 5.420813, y: 0.059789658, z: -6.4491086} line: 7 column: 1 - roomDestinationIndex: 9 + roomDestinationIndex: 15 fatherLevelNodes: - {x: 6, y: 1} nextLevelNodes: @@ -447,10 +443,10 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 4 - roomSprite: {fileID: 865446097, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: e2a576b37ecc9ee4a92a1595d55eeb41, type: 3} isUse: 1 - passBy: 0 - nodePos: {x: 7.2098417, y: 0.059762, z: -5.339107} + passBy: 1 + nodePos: {x: 5.420813, y: 0.059791565, z: -3.9491115} line: 7 column: 2 roomDestinationIndex: 4 @@ -466,10 +462,10 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 1 passBy: 0 - nodePos: {x: 9.409845, y: 0.059765816, z: -7.539104} + nodePos: {x: 7.4208155, y: 0.0598011, z: -8.949108} line: 8 column: 0 roomDestinationIndex: 2 @@ -478,17 +474,18 @@ MonoBehaviour: - {x: 9, y: 0} fightEenemyPool: strong enemyList: - - 4017 - - 4018 + - RatWarrior + - FailedSample + - Pharmacist extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 1 passBy: 0 - nodePos: {x: 9.409847, y: 0.059767723, z: -6.4391055} + nodePos: {x: 7.4208164, y: 0.0598011, z: -6.4491076} line: 8 column: 1 roomDestinationIndex: 2 @@ -497,17 +494,18 @@ MonoBehaviour: - {x: 9, y: 1} fightEenemyPool: strong enemyList: - - 4017 - - 4018 + - RatWarrior + - FailedSample + - Pharmacist extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 1 - roomSprite: {fileID: 929432110, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: f3df96407bf665b4d8cd8f13dfb3d6d0, type: 3} isUse: 1 - passBy: 0 - nodePos: {x: 9.409851, y: 0.05976963, z: -5.339107} + passBy: 1 + nodePos: {x: 7.4208174, y: 0.05980301, z: -3.9491105} line: 8 column: 2 roomDestinationIndex: 2 @@ -516,18 +514,19 @@ MonoBehaviour: - {x: 9, y: 2} fightEenemyPool: elite enemyList: - - 4005 - - 4006 + - ContaminatusImmortalis + - ContaminatusImmortalis + - PrismReflector extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - levelDataList: - roomType: 12 - roomSprite: {fileID: 21300000, guid: 99d6cfcd8d628454989abc09534f0b64, type: 3} + roomSprite: {fileID: 21300000, guid: 6b27bdf9c297a274f95e945a248a7668, type: 3} isUse: 1 passBy: 0 - nodePos: {x: 11.609858, y: 0.059773445, z: -7.539102} + nodePos: {x: 9.420822, y: 0.059812546, z: -8.949106} line: 9 column: 0 roomDestinationIndex: 15 @@ -541,14 +540,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 6 - roomSprite: {fileID: -687936468, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + - roomType: 8 + roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3} isUse: 1 passBy: 0 - nodePos: {x: 11.609861, y: 0.059775352, z: -6.4391055} + nodePos: {x: 9.420824, y: 0.059812546, z: -6.4491076} line: 9 column: 1 - roomDestinationIndex: 3 + roomDestinationIndex: 9 fatherLevelNodes: - {x: 8, y: 1} nextLevelNodes: @@ -559,14 +558,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 9 - roomSprite: {fileID: 21300000, guid: 2b6cbc9fb953ffc4eb02968e26d8f0cb, type: 3} + - roomType: 6 + roomSprite: {fileID: 21300000, guid: dc3014f38b95b24448577e14bee06967, type: 3} isUse: 1 - passBy: 0 - nodePos: {x: 11.609866, y: 0.05977726, z: -5.339106} + passBy: 1 + nodePos: {x: 9.420826, y: 0.059814453, z: -3.9491086} line: 9 column: 2 - roomDestinationIndex: 12 + roomDestinationIndex: 3 fatherLevelNodes: - {x: 8, y: 2} nextLevelNodes: @@ -578,31 +577,30 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 2 - roomSprite: {fileID: 21300000, guid: 182c3c1bcddd9bd4a86cdaaf70e3d6b0, type: 3} + - roomType: 0 + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 0 passBy: 0 - nodePos: {x: 13.809872, y: 0.059781075, z: -7.539102} + nodePos: {x: 11.4208355, y: 0.05982399, z: -8.949108} line: 10 column: 0 roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: [] - fightEenemyPool: eliteAndMonster + fightEenemyPool: strong enemyList: - - 4005 - - 4006 - extraEnemyList: - - 4007 - - 4008 + - RatWarrior + - FailedSample + - Pharmacist + extraEnemyList: [] mapIndex: 100001 - extraMapIndex: 100001 + extraMapIndex: isExtra: 0 - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 1 - passBy: 0 - nodePos: {x: 13.8098755, y: 0.059782982, z: -6.4391055} + passBy: 1 + nodePos: {x: 11.420842, y: 0.05982399, z: -6.4491076} line: 10 column: 1 roomDestinationIndex: 2 @@ -614,36 +612,39 @@ MonoBehaviour: - {x: 11, y: 1} fightEenemyPool: strong enemyList: - - 4017 - - 4018 + - PollutionSpreader + - Gravitus extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - - roomType: 0 - roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + - roomType: 2 + roomSprite: {fileID: 21300000, guid: f3df96407bf665b4d8cd8f13dfb3d6d0, type: 3} isUse: 0 passBy: 0 - nodePos: {x: 13.809877, y: 0.05978489, z: -5.339107} + nodePos: {x: 11.420845, y: 0.059825897, z: -3.9491096} line: 10 column: 2 roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: [] - fightEenemyPool: strong + fightEenemyPool: eliteAndMonster enemyList: - - 4017 - - 4018 - extraEnemyList: [] + - Gravitus + - PollutionSpreader + - PollutionSpreader + extraEnemyList: + - Thief + - PrismReflector mapIndex: 100001 - extraMapIndex: + extraMapIndex: 100001 isExtra: 0 - levelDataList: - roomType: 8 - roomSprite: {fileID: 21300000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} + roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3} isUse: 0 passBy: 0 - nodePos: {x: 16.009886, y: 0.059788704, z: -7.539103} + nodePos: {x: 13.420853, y: 0.059835434, z: -8.949106} line: 11 column: 0 roomDestinationIndex: 9 @@ -656,10 +657,10 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 8 - roomSprite: {fileID: 21300000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} + roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3} isUse: 1 - passBy: 0 - nodePos: {x: 16.009893, y: 0.05979061, z: -6.4391065} + passBy: 1 + nodePos: {x: 13.420856, y: 0.059835434, z: -6.4491067} line: 11 column: 1 roomDestinationIndex: 9 @@ -674,10 +675,10 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 8 - roomSprite: {fileID: 21300000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} + roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3} isUse: 0 passBy: 0 - nodePos: {x: 16.009895, y: 0.05979252, z: -5.339108} + nodePos: {x: 13.42086, y: 0.05983734, z: -3.9491086} line: 11 column: 2 roomDestinationIndex: 9 @@ -691,10 +692,10 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 5 - roomSprite: {fileID: -1693594073, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: 4b752f8ca710d6f4c837a1396184e644, type: 3} isUse: 0 passBy: 0 - nodePos: {x: 18.209911, y: 0.059796333, z: -7.539104} + nodePos: {x: 15.420868, y: 0.059846878, z: -8.949108} line: 12 column: 0 roomDestinationIndex: 14 @@ -707,10 +708,10 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 5 - roomSprite: {fileID: -1693594073, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: 4b752f8ca710d6f4c837a1396184e644, type: 3} isUse: 1 - passBy: 0 - nodePos: {x: 18.20992, y: 0.05979824, z: -6.4391065} + passBy: 1 + nodePos: {x: 15.420868, y: 0.059846878, z: -6.4491076} line: 12 column: 1 roomDestinationIndex: 14 @@ -725,10 +726,10 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 5 - roomSprite: {fileID: -1693594073, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: 4b752f8ca710d6f4c837a1396184e644, type: 3} isUse: 0 passBy: 0 - nodePos: {x: 18.209927, y: 0.059800148, z: -5.339107} + nodePos: {x: 15.420874, y: 0.059848785, z: -3.9491096} line: 12 column: 2 roomDestinationIndex: 14 @@ -742,26 +743,31 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 3 - roomSprite: {fileID: 865203525, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: 01fefd0475d0278479d34f4c72ce2525, type: 3} isUse: 0 passBy: 0 - nodePos: {x: 20.409945, y: 0.059803963, z: -7.039104} + nodePos: {x: 17.42089, y: 0.059858322, z: -8.949108} line: 13 column: 0 roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: Boss - enemyList: [] + enemyList: + - Leviathan + - StonePillar + - StonePillar + - StonePillar + - StonePillar extraEnemyList: [] - mapIndex: + mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 3 - roomSprite: {fileID: 865203525, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: 01fefd0475d0278479d34f4c72ce2525, type: 3} isUse: 1 - passBy: 0 - nodePos: {x: 20.409952, y: 0.05980587, z: -5.9391055} + passBy: 1 + nodePos: {x: 17.420897, y: 0.059858322, z: -6.4491076} line: 13 column: 1 roomDestinationIndex: 2 @@ -769,24 +775,34 @@ MonoBehaviour: - {x: 12, y: 1} nextLevelNodes: [] fightEenemyPool: Boss - enemyList: [] + enemyList: + - Leviathan + - StonePillar + - StonePillar + - StonePillar + - StonePillar extraEnemyList: [] - mapIndex: + mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 3 - roomSprite: {fileID: 865203525, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + roomSprite: {fileID: 21300000, guid: 01fefd0475d0278479d34f4c72ce2525, type: 3} isUse: 0 passBy: 0 - nodePos: {x: 20.40996, y: 0.059807777, z: -4.839107} + nodePos: {x: 17.420906, y: 0.05986023, z: -3.9491096} line: 13 column: 2 roomDestinationIndex: 2 fatherLevelNodes: [] nextLevelNodes: [] fightEenemyPool: Boss - enemyList: [] + enemyList: + - Leviathan + - StonePillar + - StonePillar + - StonePillar + - StonePillar extraEnemyList: [] - mapIndex: + mapIndex: 100001 extraMapIndex: isExtra: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset index 40400173..823e1827 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset @@ -31,7 +31,6 @@ MonoBehaviour: - 1001 - 1002 - 1002 - - 1002 - 1003 - 1003 - 2032 diff --git a/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta b/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta deleted file mode 100644 index 17bba4e5..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: a94cf6fef2879da4c91e5ef768aadf4e -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/ForgingPoint.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/ForgingPoint.unity index 3356c4c0..b66ebfcc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/ForgingPoint.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/ForgingPoint.unity @@ -376,6 +376,81 @@ RectTransform: m_AnchoredPosition: {x: -42.98, y: -2.42} m_SizeDelta: {x: 98.1876, y: 88.1946} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &94901762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 94901763} + - component: {fileID: 94901765} + - component: {fileID: 94901764} + m_Layer: 0 + m_Name: CardFather + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &94901763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94901762} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000013411036} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 714071583} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000061035156, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &94901764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94901762} + 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: 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 &94901765 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94901762} + m_CullTransparentMesh: 1 --- !u!1 &108476449 GameObject: m_ObjectHideFlags: 0 @@ -558,7 +633,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 125662691} 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: [] @@ -566,7 +641,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &125662693 @@ -582,7 +657,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: 0.78431374, b: 0.3254902, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -721,6 +796,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 950956916} - {fileID: 1058990686} - {fileID: 711077792} - {fileID: 1627635472} @@ -798,17 +874,18 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 144172313} 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: + - {fileID: 798194291} - {fileID: 299929896} - {fileID: 484606090} m_Father: {fileID: 1035102626} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -13} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &144172315 @@ -862,20 +939,20 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 144172313} - m_Enabled: 1 + m_Enabled: 0 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_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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: -128003227, guid: e3fafd47d4a57964c93eec4dd1bc20d7, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1692,7 +1769,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 32 + m_Left: 61 m_Right: 0 m_Top: 15 m_Bottom: 0 @@ -1700,7 +1777,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 250, y: 400} - m_Spacing: {x: 25, y: 25} + m_Spacing: {x: 0, y: 25} m_Constraint: 0 m_ConstraintCount: 2 --- !u!222 &214565956 @@ -2135,7 +2212,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.000091553, y: -272.44} + m_AnchoredPosition: {x: -0.000091553, y: -337} m_SizeDelta: {x: 300, y: 245.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &288160811 @@ -2340,7 +2417,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -6.100006, y: -19.699997} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &299929897 @@ -2356,7 +2433,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: 0.78431374, b: 0.3254902, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2365,7 +2442,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -2514,7 +2591,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: 0.78431374, b: 0.3254902, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3447,8 +3524,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.47, y: 166.77} - m_SizeDelta: {x: 320.41, y: 294.17} + m_AnchoredPosition: {x: -1.4, y: 139.97} + m_SizeDelta: {x: 243.31, y: 255.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &446439091 MonoBehaviour: @@ -4018,7 +4095,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 484606089} 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.0000023469} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4027,7 +4104,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -58.1, y: -25} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 1, y: 0.5} --- !u!114 &484606091 @@ -4099,7 +4176,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4266,7 +4343,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: 0.78431374, b: 0.3254902, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -5934,7 +6011,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.000091553, y: -272.44} + m_AnchoredPosition: {x: -0.000091553, y: -337} m_SizeDelta: {x: 300, y: 245.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &645092624 @@ -6859,7 +6936,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 711077791} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -7001,7 +7078,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 94901763} - {fileID: 288160810} + - {fileID: 822923435} - {fileID: 1228604083} m_Father: {fileID: 1950253017} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7017,7 +7096,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 714071582} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: @@ -7123,6 +7202,8 @@ MonoBehaviour: casePostion: isSelected: 0 mask: {fileID: 1228604082} + cardFather: {fileID: 94901763} + previewCard: {fileID: 0} --- !u!1 &716912142 GameObject: m_ObjectHideFlags: 0 @@ -7471,6 +7552,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 795312640} m_CullTransparentMesh: 1 +--- !u!1 &798194290 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 798194291} + - component: {fileID: 798194293} + - component: {fileID: 798194292} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &798194291 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798194290} + 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: 144172314} + 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: 6.69, y: -14.98} + m_SizeDelta: {x: 220.17, y: 93.92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &798194292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798194290} + 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e3fafd47d4a57964c93eec4dd1bc20d7, 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 &798194293 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798194290} + m_CullTransparentMesh: 1 --- !u!1 &810906339 GameObject: m_ObjectHideFlags: 0 @@ -7680,7 +7836,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 811748884} m_CullTransparentMesh: 1 ---- !u!1 &837118770 +--- !u!1 &822923434 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7688,50 +7844,106 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 837118771} - - component: {fileID: 837118773} - - component: {fileID: 837118772} - m_Layer: 5 - m_Name: Background + - component: {fileID: 822923435} + - component: {fileID: 822923438} + - component: {fileID: 822923437} + - component: {fileID: 822923436} + m_Layer: 0 + m_Name: Button (Legacy) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &837118771 +--- !u!224 &822923435 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 837118770} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000067078054} + m_GameObject: {fileID: 822923434} + 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: 689671206} - m_Father: {fileID: 1080984385} + m_Children: [] + m_Father: {fileID: 714071583} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -7.75, y: 9.019989} + m_SizeDelta: {x: 96.38, y: 218.46} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &837118772 +--- !u!114 &822923436 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 837118770} + m_GameObject: {fileID: 822923434} + 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: 822923437} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 714071587} + m_TargetAssemblyTypeName: EffectForgCaseNode, Assembly-CSharp + m_MethodName: ChangeCardVal + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &822923437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 822923434} 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_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 @@ -7748,15 +7960,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &837118773 +--- !u!222 &822923438 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 837118770} + m_GameObject: {fileID: 822923434} m_CullTransparentMesh: 1 ---- !u!1 &838407397 +--- !u!1 &837118770 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7764,33 +7976,109 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 838407398} - - component: {fileID: 838407401} - - component: {fileID: 838407400} - - component: {fileID: 838407399} + - component: {fileID: 837118771} + - component: {fileID: 837118773} + - component: {fileID: 837118772} m_Layer: 5 - m_Name: Y + m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &838407398 +--- !u!224 &837118771 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 838407397} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 837118770} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0000067078054} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1063148219} - m_Father: {fileID: 678185481} + - {fileID: 689671206} + m_Father: {fileID: 1080984385} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &837118772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 837118770} + 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: 10905, 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 &837118773 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 837118770} + m_CullTransparentMesh: 1 +--- !u!1 &838407397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 838407398} + - component: {fileID: 838407401} + - component: {fileID: 838407400} + - component: {fileID: 838407399} + m_Layer: 5 + m_Name: Y + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &838407398 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838407397} + 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: 1063148219} + m_Father: {fileID: 678185481} + 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: -202, y: -142} m_SizeDelta: {x: 150, y: 90} @@ -8288,6 +8576,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 878987069} m_CullTransparentMesh: 1 +--- !u!1 &888432078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 888432079} + - component: {fileID: 888432081} + - component: {fileID: 888432080} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &888432079 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888432078} + 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: 1590315869} + 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: 6.69, y: -14.98} + m_SizeDelta: {x: 220.17, y: 93.92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &888432080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888432078} + 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e3fafd47d4a57964c93eec4dd1bc20d7, 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 &888432081 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888432078} + m_CullTransparentMesh: 1 --- !u!1 &891354727 GameObject: m_ObjectHideFlags: 0 @@ -9158,8 +9521,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -0.00030518} + m_AnchoredPosition: {x: -57, y: -39.69} + m_SizeDelta: {x: 45.56, y: -91.73} m_Pivot: {x: 1, y: 1} --- !u!114 &948089587 MonoBehaviour: @@ -9230,8 +9593,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 47c71ff66187d0244b9812a1e0b01bc0, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9324,6 +9687,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 950036866} m_CullTransparentMesh: 1 +--- !u!1 &950956915 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 950956916} + - component: {fileID: 950956918} + - component: {fileID: 950956917} + m_Layer: 0 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &950956916 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 950956915} + 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: [] + m_Father: {fileID: 144080779} + 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: 586, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &950956917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 950956915} + 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4645ab89a22e03040b61b5552adf6a4a, 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 &950956918 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 950956915} + m_CullTransparentMesh: 1 --- !u!1 &989867492 GameObject: m_ObjectHideFlags: 0 @@ -9436,9 +9874,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1020088328} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} - m_LocalScale: {x: 1.00008, y: 1.00008, z: 1.00008} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0000023469} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 311316030} @@ -9446,7 +9884,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -58.1, y: -25} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1020088330 @@ -9518,7 +9956,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -10149,7 +10587,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.25, g: 1, b: 0.5537548, a: 0.392} + 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 @@ -10790,6 +11228,8 @@ MonoBehaviour: casePostion: isSelected: 0 mask: {fileID: 2011494278} + cardFather: {fileID: 1150272212} + previewCard: {fileID: 0} --- !u!224 &1138261976 RectTransform: m_ObjectHideFlags: 0 @@ -10802,7 +11242,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1150272212} - {fileID: 642600935} + - {fileID: 1317213301} - {fileID: 2011494281} m_Father: {fileID: 1950253017} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10818,7 +11260,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1138261974} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: @@ -10936,6 +11378,81 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1150272211 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1150272212} + - component: {fileID: 1150272214} + - component: {fileID: 1150272213} + m_Layer: 0 + m_Name: CardFather + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1150272212 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1150272211} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000013411036} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1138261976} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000061035156, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1150272213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1150272211} + 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: 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 &1150272214 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1150272211} + m_CullTransparentMesh: 1 --- !u!1 &1152541299 GameObject: m_ObjectHideFlags: 0 @@ -12263,15 +12780,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 32 + m_Left: 61 m_Right: 0 - m_Top: 15 + m_Top: 43 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 250, y: 400} - m_Spacing: {x: 25, y: 25} + m_Spacing: {x: 0, y: 25} m_Constraint: 0 m_ConstraintCount: 2 --- !u!222 &1226775577 @@ -13042,7 +13559,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1945731397} - {fileID: 2144191000} + - {fileID: 2066531540} - {fileID: 773536489} m_Father: {fileID: 1950253017} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13096,7 +13615,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1263630287} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: @@ -13164,6 +13683,8 @@ MonoBehaviour: casePostion: isSelected: 0 mask: {fileID: 773536488} + cardFather: {fileID: 1945731397} + previewCard: {fileID: 0} --- !u!1 &1268083110 GameObject: m_ObjectHideFlags: 0 @@ -13221,8 +13742,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: b37bc64881e17af4687851e8ad521366, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -13349,6 +13870,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2089913575} - {fileID: 1732576279} - {fileID: 948089586} m_Father: {fileID: 711077792} @@ -13395,21 +13917,21 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1269450906} - m_Enabled: 1 + m_Enabled: 0 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.392} + 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: 21300000, guid: 7f9428669aae505459e976a8182c7c53, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -13798,6 +14320,7 @@ MonoBehaviour: - {fileID: 1226775575} - {fileID: 214565954} cardObject: [] + cardContent: {fileID: 1035102626} chooseCardEntity: {fileID: 0} chooseCardFather: {fileID: 1584534895} eventSystem: {fileID: 1696497418} @@ -13847,7 +14370,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1309943240 RectTransform: m_ObjectHideFlags: 0 @@ -13906,6 +14429,138 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1309943239} m_CullTransparentMesh: 1 +--- !u!1 &1317213300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1317213301} + - component: {fileID: 1317213304} + - component: {fileID: 1317213303} + - component: {fileID: 1317213302} + m_Layer: 0 + m_Name: Button (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1317213301 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1317213300} + 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: 1138261976} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -7.75, y: 9.019989} + m_SizeDelta: {x: 96.38, y: 218.46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1317213302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1317213300} + 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: 1317213303} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1138261975} + m_TargetAssemblyTypeName: EffectForgCaseNode, Assembly-CSharp + m_MethodName: ChangeCardVal + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1317213303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1317213300} + 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: 10905, 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 &1317213304 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1317213300} + m_CullTransparentMesh: 1 --- !u!1 &1323047184 GameObject: m_ObjectHideFlags: 0 @@ -16147,17 +16802,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1547031316} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalPosition: {x: 0, y: 0, z: -0.0000026822} + m_LocalScale: {x: 1.51, y: 1.51, z: 1.51} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 125662692} m_Father: {fileID: 144080779} 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: 806, y: -442} - m_SizeDelta: {x: 202.18, y: 77.42} + m_AnchoredPosition: {x: 586, y: -416} + m_SizeDelta: {x: 202.18, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1547031318 MonoBehaviour: @@ -16235,7 +16890,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: ce75a63e1dc9d6646a618e57e219be4a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16244,7 +16899,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 9.6 --- !u!222 &1547031320 CanvasRenderer: m_ObjectHideFlags: 0 @@ -16541,7 +17196,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: -399.91, y: -400} + m_AnchoredPosition: {x: -52, y: -400} m_SizeDelta: {x: 220.28, y: 58.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1565380960 @@ -16695,7 +17350,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1584534894} 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.000021458} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -16703,8 +17358,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: 51} - m_SizeDelta: {x: 450.21, y: 669.8} + m_AnchoredPosition: {x: 0, y: 82.64} + m_SizeDelta: {x: 312.85, y: 462.43} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1584534896 MonoBehaviour: @@ -16719,7 +17374,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + 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 @@ -16771,17 +17426,18 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1590315868} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000029505998} + m_LocalPosition: {x: 0, y: 0, z: -0.0000016094953} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 888432079} - {fileID: 1880873888} - {fileID: 1020088329} m_Father: {fileID: 1035102626} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -13.000003} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &1590315870 @@ -16835,20 +17491,20 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1590315868} - m_Enabled: 1 + m_Enabled: 0 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_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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: -128003227, guid: e3fafd47d4a57964c93eec4dd1bc20d7, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16857,7 +17513,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 7.19 --- !u!222 &1590315872 CanvasRenderer: m_ObjectHideFlags: 0 @@ -17131,7 +17787,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1627635471} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -19679,7 +20335,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -17.5, y: -19.5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1880873889 @@ -19695,7 +20351,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: 0.7839916, b: 0.3254717, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -19704,7 +20360,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -20462,6 +21118,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1923720843} m_CullTransparentMesh: 1 +--- !u!1 &1945731396 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1945731397} + - component: {fileID: 1945731399} + - component: {fileID: 1945731398} + m_Layer: 0 + m_Name: CardFather + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1945731397 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945731396} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000013411036} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1263630288} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1945731398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945731396} + 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: 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 &1945731399 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945731396} + m_CullTransparentMesh: 1 --- !u!1 &1948005877 GameObject: m_ObjectHideFlags: 0 @@ -20662,7 +21393,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -391.80005, y: -2.9124756} + m_AnchoredPosition: {x: -48, y: -2.9124756} m_SizeDelta: {x: -838.78, y: -433.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1950253018 @@ -22209,6 +22940,138 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2062840768} m_CullTransparentMesh: 1 +--- !u!1 &2066531539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2066531540} + - component: {fileID: 2066531543} + - component: {fileID: 2066531542} + - component: {fileID: 2066531541} + m_Layer: 0 + m_Name: Button (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2066531540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2066531539} + 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: 1263630288} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -7.75, y: 9.019989} + m_SizeDelta: {x: 96.38, y: 218.46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2066531541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2066531539} + 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: 2066531542} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1263630292} + m_TargetAssemblyTypeName: EffectForgCaseNode, Assembly-CSharp + m_MethodName: ChangeCardVal + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &2066531542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2066531539} + 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: 10905, 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 &2066531543 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2066531539} + m_CullTransparentMesh: 1 --- !u!1 &2068068575 GameObject: m_ObjectHideFlags: 0 @@ -22693,6 +23556,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2086805637} m_CullTransparentMesh: 1 +--- !u!1 &2089913574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2089913575} + - component: {fileID: 2089913577} + - component: {fileID: 2089913576} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2089913575 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2089913574} + 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: 1269450907} + 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.9999, y: 6.0124} + m_SizeDelta: {x: 1161.5, y: 1002} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2089913576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2089913574} + 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: 21300000, guid: 7f9428669aae505459e976a8182c7c53, 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 &2089913577 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2089913574} + m_CullTransparentMesh: 1 --- !u!1 &2111508256 GameObject: m_ObjectHideFlags: 0 @@ -23249,7 +24187,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.000091553, y: -272.44} + m_AnchoredPosition: {x: -0.000091553, y: -337} m_SizeDelta: {x: 300, y: 245.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2144191001 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/EffectForgCaseNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/EffectForgCaseNode.cs index 1d3c3ecc..22a14a52 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/EffectForgCaseNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/EffectForgCaseNode.cs @@ -15,25 +15,49 @@ public class EffectForgCaseNode : MonoBehaviour public bool isSelected;//ѡ public GameObject mask; + + [Header("ЧԤ")] + public Transform cardFather; + public CardEntity previewCard; + public void ChangeCardVal() { - if(isSelected ==false ) + /* if(isSelected ==false ) + { + if (linkID.Equals("color")) + { + ForgintPointManager.Instance.ChangeCardCaseVal(newCondition); + } + else + { + + ForgintPointManager.Instance.ChangeCardColorCaseVal(kvp, linkID, casePostion); + } + + ChangeMask(); + }*/ + ChangeMask(); + } + public void SetUpCardPreview() + { + if (previewCard != null) { - if (linkID.Equals("color")) + if (previewCard.CardId != ForgintPointManager .Instance .chooseCardEntity.CardId) { - ForgintPointManager.Instance.ChangeCardCaseVal(newCondition); + CardOriginalDataList.Instance.existEffectCardOriginalDataList.Remove(previewCard.cardId); } - else - { + Destroy(previewCard.gameObject); + } - ForgintPointManager.Instance.ChangeCardColorCaseVal(kvp, linkID, casePostion); - } + //id + string preCardID = ForgintPointManager.Instance.GetPreviewCardID(kvp, linkID, casePostion); + //Ԥ + var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(preCardID, cardFather); + card.transform.localScale = new Vector3(2.5f, 2.5f, 2.5f); + card.transform.localPosition = new Vector3(0, 0, 0); + previewCard = card.GetComponent(); - ChangeMask(); - } - } - public void ChangeMask() { foreach (EffectForgCaseNode node in ForgintPointManager.Instance.effectCaseNodeList) @@ -43,6 +67,6 @@ public class EffectForgCaseNode : MonoBehaviour } mask.SetActive(true); isSelected = true; - + ForgintPointManager.Instance.newEffectCardID = previewCard.cardId; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs index 32bbe02f..1f0ea687 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs @@ -38,6 +38,7 @@ public class ForgintPointManager : Singleton public GameObject cardViewSlot;//Ų public List cardGenerateFatherList = new List();//λ public List cardObject;//ʵɵĿ + public RectTransform cardContent;//峤 [Header("ѡпƴͼ")] public CardEntity chooseCardEntity; public Transform chooseCardFather; @@ -377,23 +378,24 @@ public class ForgintPointManager : Singleton for (int i = 0; i < cardTypeHeaderButton.Count; i++) { + //ȷСλ float heightPos = 0; for (int j = 0; j < i; j++) { heightPos += cardGenerateFatherList[j].GetComponent().sizeDelta.y; } - cardGenerateFatherList[i].GetComponent().anchoredPosition = new Vector3(0, -(heightPos + 50 * i+20), 0); - cardTypeHeaderButton[i].transform.parent.GetComponent().anchoredPosition = new Vector3(0, -(heightPos), 0); + cardGenerateFatherList[i].GetComponent().anchoredPosition = new Vector3(0, -(heightPos + 50 * i+40), 0); + cardTypeHeaderButton[i].transform.parent.GetComponent().anchoredPosition = new Vector3(0, -(heightPos+20), 0); if (cardTypeHeaderButton[i].isFold ==false ) { - cardGenerateFatherList[i].GetComponent().sizeDelta = new Vector2(0, 15 + 425 * (cardTypeHeaderButton[i].cardId.Count/4+1)); + cardGenerateFatherList[i].GetComponent().sizeDelta = new Vector2(0, 15 + 425 * (Mathf.CeilToInt(cardTypeHeaderButton[i].cardId.Count / 4.0f))); } else { - cardGenerateFatherList[i].GetComponent().sizeDelta = new Vector2(0, 50); + cardGenerateFatherList[i].GetComponent().sizeDelta = new Vector2(0, 100); } if (cardTypeHeaderButton[i].isFold ==false ) @@ -421,6 +423,14 @@ public class ForgintPointManager : Singleton } } } + + //ȷ峤 + float contentHight = 200; + for(int i=0;i< cardGenerateFatherList.Count;i++) + { + contentHight += cardGenerateFatherList[i].GetComponent().sizeDelta.y; + } + cardContent.sizeDelta = new Vector2(0, contentHight); } //ѡɿƴͼ @@ -431,7 +441,7 @@ public class ForgintPointManager : Singleton Destroy(chooseCardEntity.gameObject); } var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardId, chooseCardFather); - card.transform.localScale = new Vector3(3.45f, 3.45f, 3.45f); + card.transform.localScale = new Vector3(2.4f, 2.4f, 2.4f); card.transform.localPosition = new Vector3(0, 0, 0); chooseCardEntity = card.GetComponent(); @@ -460,7 +470,7 @@ public class ForgintPointManager : Singleton newColorForgingCard = card.GetComponent(); } //Ч - public void CreatEffectForgingCardPreview() + public void CreatEffectForgingCardPreview()//ԭ濨 { if (newEffectForgingCard != null) { @@ -475,6 +485,7 @@ public class ForgintPointManager : Singleton card.transform.localPosition = new Vector3(0, 0, 0); newEffectForgingCard = card.GetComponent(); } + //ɫ public void ChangeColor(int color) { @@ -737,6 +748,7 @@ public class ForgintPointManager : Singleton { node.mask.SetActive(false); node.isSelected = false; + node.SetUpCardPreview(); } } @@ -765,6 +777,20 @@ public class ForgintPointManager : Singleton Debug.Log(cardID); CreatEffectForgingCardPreview(); } + public string GetPreviewCardID(KeyValuePair kvp, string originFun, string position) + { + string cardID = null; + if (chooseCardEntity.cardOriginalData.CardId.StartsWith("1")) + { + cardID = CardManager.Instance.switchCardFunAndValForDyeingCard(chooseCardEntity.cardOriginalData, kvp, originFun); + + } + else + { + cardID = CardManager.Instance.switchCardFunAndVal(chooseCardEntity.cardOriginalData, kvp, position, originFun); + } + return cardID; + } public void ChangeInforText(int x,int y,string massage,int costPoint) { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs index d6bf3af8..577715fb 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using UnityEngine; +using static DeformEditor.DeformEditorGUIUtility; using static LevelDevelopManager; public class LeveGeneraterNew : Singleton @@ -768,8 +769,8 @@ public class LeveGeneraterNew : Singleton } //÷͵ͼ public void SetRoomEnemyPoolAndMap() - { - ReadEnemyPoolInforCsv(enemyPoolFileName); + { + /* ReadEnemyPoolInforCsv(enemyPoolFileName); //Ȩظʱ Dictionary weakProbabilityDic = new Dictionary(); int weakTotalWight = 0; @@ -780,7 +781,7 @@ public class LeveGeneraterNew : Singleton } List strongProbabilityList = probabilityDictionaryStrong.Keys.ToList(); List eliteProbabilityList = probabilityDictionaryElite.Keys.ToList(); - List bossProbabilityList = probabilityDictionaryBoss.Keys.ToList(); + List bossProbabilityList = probabilityDictionaryBoss.Keys.ToList();*/ //ù for (int i = 0; i < LevelDevelopManager.Instance.levelMap.Count; i++) { @@ -794,25 +795,29 @@ public class LeveGeneraterNew : Singleton { currentLevelNode.fightEenemyPool = Name.EnemyPool.Weak; //ݹ͵ͼ - int mark1 = Random.Range(0, weakTotalWight); - List weakProbabilityList = weakProbabilityDic.Keys.ToList(); - for (int a = 0; a < weakProbabilityList.Count; a++) - { - if (mark1 < weakProbabilityList[a]) - { - string[] enemys = probabilityDictionaryWeak[weakProbabilityDic[weakProbabilityList[a]]][3].Split(';'); - currentLevelNode.enemyList = enemys.ToList(); - string[] maps = probabilityDictionaryWeak[weakProbabilityDic[weakProbabilityList[a]]][4].Split(';'); - currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; - break; - } - } + /* int mark1 = Random.Range(0, weakTotalWight); + List weakProbabilityList = weakProbabilityDic.Keys.ToList(); + for (int a = 0; a < weakProbabilityList.Count; a++) + { + if (mark1 < weakProbabilityList[a]) + { + string[] enemys = probabilityDictionaryWeak[weakProbabilityDic[weakProbabilityList[a]]][3].Split(';'); + currentLevelNode.enemyList = enemys.ToList(); + string[] maps = probabilityDictionaryWeak[weakProbabilityDic[weakProbabilityList[a]]][4].Split(';'); + currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; + break; + } + }*/ + currentLevelNode.enemyList = EnemyPool.GetRandomEnemyPool(EnemyPool.weakEnemyPool); + currentLevelNode.mapIndex = "100001"; } else { currentLevelNode.fightEenemyPool = Name.EnemyPool.Strong; + currentLevelNode.enemyList = EnemyPool.GetRandomEnemyPool(EnemyPool.strongEnemyPool); + currentLevelNode.mapIndex = "100001"; //ݹ͵ͼ - int mark2 = Random.Range(0, 100); + /* int mark2 = Random.Range(0, 100); for (int a = 0; a < strongProbabilityList.Count; a++) { if (mark2 < strongProbabilityList[a]) @@ -822,13 +827,15 @@ public class LeveGeneraterNew : Singleton string[] maps = probabilityDictionaryStrong[strongProbabilityList[a]][4].Split(';'); currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; } - } + }*/ } break; case RoomType.boss: currentLevelNode.fightEenemyPool = Name.EnemyPool.Boss; + currentLevelNode.enemyList = EnemyPool.GetRandomEnemyPool(EnemyPool.bossEnemyPool); + currentLevelNode.mapIndex = "100001"; //ݹ͵ͼ - int mark3 = Random.Range(0, 100); + /* int mark3 = Random.Range(0, 100); for (int a = 0; a < bossProbabilityList.Count; a++) { if (mark3 < bossProbabilityList[a]) @@ -838,12 +845,14 @@ public class LeveGeneraterNew : Singleton string[] maps = probabilityDictionaryBoss[bossProbabilityList[a]][4].Split(';'); currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; } - } + }*/ break; case RoomType.eliteMonster: currentLevelNode.fightEenemyPool = Name.EnemyPool.Elite; + currentLevelNode.enemyList = EnemyPool.GetRandomEnemyPool(EnemyPool.eliteEnemyPool); + currentLevelNode.mapIndex = "100001"; //ݹ͵ͼ - int mark4 = Random.Range(0, 100); + /* int mark4 = Random.Range(0, 100); for (int a = 0; a < eliteProbabilityList.Count; a++) { if (mark4 < eliteProbabilityList[a]) @@ -853,13 +862,17 @@ public class LeveGeneraterNew : Singleton string[] maps = probabilityDictionaryElite[eliteProbabilityList[a]][4].Split(';'); currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; } - } + }*/ break; case RoomType.eliteAndMonster: currentLevelNode.fightEenemyPool = Name.EnemyPool.EliteAndMonster; + currentLevelNode.enemyList = EnemyPool.GetRandomEnemyPool(EnemyPool.eliteEnemyPool); + currentLevelNode.mapIndex = "100001"; + currentLevelNode.extraEnemyList = EnemyPool.GetRandomEnemyPool(EnemyPool.strongEnemyPool); + currentLevelNode.extraMapIndex = "100001"; //ݹ͵ͼ - int mark5 = Random.Range(0, 100); + /*int mark5 = Random.Range(0, 100); for (int a = 0; a < eliteProbabilityList.Count; a++) { if (mark5 < eliteProbabilityList[a]) @@ -882,7 +895,7 @@ public class LeveGeneraterNew : Singleton currentLevelNode.extraMapIndex = maps[Random.Range(0, maps.Count())]; break; } - } + }*/ break; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs index 21978357..b35b7f0f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs @@ -278,17 +278,19 @@ public class MapManager : Singleton if(currentLevelData .isExtra ==false ) { - foreach (var enemyID in currentLevelData.enemyList) - { - enemyList.Add(EnemyPool.enemyIndexToString(int.Parse(enemyID))); - } + /* foreach (var enemyID in currentLevelData.enemyList) + { + enemyList.Add(EnemyPool.enemyIndexToString(int.Parse(enemyID))); + }*/ + enemyList = currentLevelData.enemyList; } else { - foreach (var enemyID in currentLevelData.extraEnemyList) + /*foreach (var enemyID in currentLevelData.extraEnemyList) { enemyList.Add(EnemyPool.enemyIndexToString(int.Parse(enemyID))); - } + }*/ + enemyList = currentLevelData.extraEnemyList; } List enemyPrefabList = EnemyPool.getEnemyPrefab(enemyList);