diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/1.png b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/1.png new file mode 100644 index 00000000..2bda8d2d Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/1.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/1.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/1.png.meta new file mode 100644 index 00000000..24997e67 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/1.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 751e27ce659120f419c0420bb75e51ff +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/Image/2D新场景/卡子-学院/2.png b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/2.png new file mode 100644 index 00000000..f3925b34 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/2.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/2.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/2.png.meta new file mode 100644 index 00000000..f69e0fe5 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: beffc65eaa76dd24bbe6e126028b551c +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/Image/2D新场景/卡子-学院/3.png b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/3.png new file mode 100644 index 00000000..d2e11693 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/3.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/3.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/3.png.meta new file mode 100644 index 00000000..67692ddf --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/3.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 4687f893df6385f4293c83a91a6eea9e +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/Image/2D新场景/卡子-学院/4.png b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/4.png new file mode 100644 index 00000000..99d14d2e Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/4.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/4.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/4.png.meta new file mode 100644 index 00000000..1e2b6e64 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/4.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 1b11ef198055b454ea5cccce3c75ce1c +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/Image/2D新场景/卡子-学院/base 1.png b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/base 1.png new file mode 100644 index 00000000..b0cefd80 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/base 1.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/base 1.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/base 1.png.meta new file mode 100644 index 00000000..942afb48 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/base 1.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 1231226fae6a4e747a7711dea18a88ad +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/Image/2D新场景/卡子-学院/units.png b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/units.png new file mode 100644 index 00000000..17e8c5d0 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/units.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/units.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/units.png.meta new file mode 100644 index 00000000..56bc4c46 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/units.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: b9624934838d52845a6405c3e4cb0197 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/BlackMap-1 1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/BlackMap-1 1.mat index e6c5eed7..9c2c24c9 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/BlackMap-1 1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/BlackMap-1 1.mat @@ -41,7 +41,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 31cbca8da65b27644a8efe3265badef8, type: 3} + m_Texture: {fileID: 2800000, guid: 1b11ef198055b454ea5cccce3c75ce1c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -65,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 31cbca8da65b27644a8efe3265badef8, type: 3} + m_Texture: {fileID: 2800000, guid: 1b11ef198055b454ea5cccce3c75ce1c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3 1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3 1.mat index 332bc118..b804c4de 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3 1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3 1.mat @@ -41,7 +41,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: c03bed53209a8b54bbcd5bd32cba33f9, type: 3} + m_Texture: {fileID: 2800000, guid: 751e27ce659120f419c0420bb75e51ff, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -65,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: c03bed53209a8b54bbcd5bd32cba33f9, type: 3} + m_Texture: {fileID: 2800000, guid: 751e27ce659120f419c0420bb75e51ff, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5 1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5 1.mat index 513ec6d5..c5c6d33d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5 1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5 1.mat @@ -28,7 +28,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 304c5dc11e4d42148ade3003da734f9d, type: 3} + m_Texture: {fileID: 2800000, guid: beffc65eaa76dd24bbe6e126028b551c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -52,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 304c5dc11e4d42148ade3003da734f9d, type: 3} + m_Texture: {fileID: 2800000, guid: beffc65eaa76dd24bbe6e126028b551c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-2 1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-2 1.mat index c42ec2da..a52cc658 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-2 1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-2 1.mat @@ -41,7 +41,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 105cb24fba0ab0848a51b96b471a76a6, type: 3} + m_Texture: {fileID: 2800000, guid: 4687f893df6385f4293c83a91a6eea9e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -65,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 105cb24fba0ab0848a51b96b471a76a6, type: 3} + m_Texture: {fileID: 2800000, guid: 4687f893df6385f4293c83a91a6eea9e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab index 044fd5cc..3a6cb5ad 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab @@ -582,6 +582,8 @@ MonoBehaviour: - {fileID: 2100000, guid: c2429528f9a1e1d46af929d9b1fd6075, type: 2} whiteColour: - {fileID: 2100000, guid: c5e28933480f51e4bbc1033400da7127, type: 2} + metalColour: + - {fileID: 2100000, guid: 32ab47c8bed7f8349a6567b550088223, type: 2} colourGameObject: {fileID: 7818877686521749494} anim: {fileID: 1919482280699867709} planePoint: {fileID: 20513801652698109} @@ -2137,7 +2139,7 @@ Transform: m_GameObject: {fileID: 4669314452435949498} serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0.174, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/ForgingPoint.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/ForgingPoint.unity index eccc5a53..8dbcc493 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/ForgingPoint.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/ForgingPoint.unity @@ -2333,6 +2333,7 @@ RectTransform: m_Children: - {fileID: 866918458} - {fileID: 1105131484} + - {fileID: 1917240223} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -6010,6 +6011,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 1302950173} + m_TargetAssemblyTypeName: ForgintPointManager, Assembly-CSharp + m_MethodName: RefreshColorMap + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 --- !u!114 &446439092 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7914,6 +7927,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 542666609} m_CullTransparentMesh: 1 +--- !u!1 &548008008 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 548008009} + - component: {fileID: 548008011} + - component: {fileID: 548008010} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &548008009 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 548008008} + 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: 1917240223} + 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 &548008010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 548008008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u91CD\u7F6E" +--- !u!222 &548008011 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 548008008} + m_CullTransparentMesh: 1 --- !u!1 &566409669 GameObject: m_ObjectHideFlags: 0 @@ -22827,7 +22919,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1728492177 Transform: m_ObjectHideFlags: 0 @@ -24727,6 +24819,139 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 +--- !u!1 &1917240222 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1917240223} + - component: {fileID: 1917240226} + - component: {fileID: 1917240225} + - component: {fileID: 1917240224} + m_Layer: 5 + m_Name: Refresh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1917240223 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917240222} + 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: 548008009} + m_Father: {fileID: 164214565} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 5, y: -442.76} + m_SizeDelta: {x: 205.05, y: 81.13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1917240224 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917240222} + 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: 1917240225} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1302950173} + m_TargetAssemblyTypeName: ForgintPointManager, Assembly-CSharp + m_MethodName: RefreshColorMap + 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 &1917240225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917240222} + 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 &1917240226 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917240222} + m_CullTransparentMesh: 1 --- !u!1 &1927267599 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index bf3cf146..0c583ed6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -5190,8 +5190,8 @@ Transform: m_GameObject: {fileID: 246813309} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.1138, y: -1.0365, z: -0.94} - m_LocalScale: {x: 1.381733, y: 1.291175, z: 1} + m_LocalPosition: {x: 0.6128, y: -1.3426, z: -0.94} + m_LocalScale: {x: 1.1127303, y: 0.94925267, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 312778994} @@ -6291,8 +6291,8 @@ Transform: m_GameObject: {fileID: 312778993} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 2.4796, y: 0.29, z: 2.83} - m_LocalScale: {x: 0.5821519, y: 0.7273536, z: 1} + m_LocalPosition: {x: 2.1, y: 0.3, z: 3.4} + m_LocalScale: {x: 0.705985, y: 0.95724624, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 246813310} @@ -6339,7 +6339,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -1 - m_Sprite: {fileID: 21300000, guid: 495cb4d7b6badd344a199deb5e17a7e4, type: 3} + m_Sprite: {fileID: 21300000, guid: 1231226fae6a4e747a7711dea18a88ad, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -6975,7 +6975,7 @@ Camera: far clip plane: 1000 field of view: 50 orthographic: 1 - orthographic size: 6 + orthographic size: 5 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -7000,7 +7000,7 @@ Transform: m_GameObject: {fileID: 330585543} serializedVersion: 2 m_LocalRotation: {x: 0.3836269, y: 0, z: 0, w: 0.9234882} - m_LocalPosition: {x: 2.73, y: 6, z: -2.68} + m_LocalPosition: {x: 2.73, y: 5.8, z: -2.88} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -15454,7 +15454,7 @@ MonoBehaviour: m_Follow: {fileID: 0} m_Lens: FieldOfView: 50 - OrthographicSize: 6 + OrthographicSize: 5 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -15480,7 +15480,7 @@ Transform: m_GameObject: {fileID: 699857786} serializedVersion: 2 m_LocalRotation: {x: 0.3836269, y: -0, z: -0, w: 0.9234882} - m_LocalPosition: {x: 2.73, y: 6, z: -2.68} + m_LocalPosition: {x: 2.73, y: 5.8, z: -2.88} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -42556,6 +42556,7 @@ MonoBehaviour: paper: {fileID: 802147682} whiteColorNode: {fileID: 1485211135} itemPrefabPath: ItemPrefab/ + hollowMask: {fileID: 0} --- !u!4 &1802141879 Transform: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs index 442c77b8..b43eda70 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -79,23 +80,30 @@ public class ForgintPointManager : Singleton if (Physics.Raycast(ray, out RaycastHit raycastHit, 500, groundLayerMask.value) && isColorDone ==true) { MapUnity mapUnity = raycastHit.collider.transform.GetComponent(); - if(choosedMapUnity !=null ) + if(mapUnity .whoColour != Name .NodeColor .Metal ) { - choosedMapUnity.influenced = false; + if (choosedMapUnity != null) + { + choosedMapUnity.influenced = false; + } + // mapUnity.influenced = true; + choosedMapUnityPool.Clear(); + choosedMapUnityPool.Add(mapUnity); + mapUnity.PlayerInfluenced(choosedMapUnityPool); + choosedMapUnity = mapUnity; + + //ͬUI + Vector3 pos = mapUnity.transform.position; + pos.y = -1.5f; + colorSelectUI.transform.position = pos; + colorSelectUI.SetActive(true); + + isColorDone = false; + } + else + { + Debug.Log("ܶ"); } - // mapUnity.influenced = true; - choosedMapUnityPool.Clear(); - choosedMapUnityPool.Add(mapUnity); - mapUnity.PlayerInfluenced(choosedMapUnityPool); - choosedMapUnity = mapUnity; - - //ͬUI - Vector3 pos = mapUnity.transform.position; - pos.y = -1.5f; - colorSelectUI.transform.position = pos; - colorSelectUI .SetActive (true); - - isColorDone = false; } break; case ForgingStats.effectForg: @@ -357,8 +365,19 @@ public class ForgintPointManager : Singleton public void ChangeColor(int color) { choosedMapUnity.switchColor(color); - choosedMapUnity.influenced = false; + choosedMapUnity.influenced = false; colorSelectUI .SetActive (false); + //ͷٽ粻Ⱦɫ + for (int i = 0; i < choosedMapUnity.unitPool.Count; i++) + { + if (choosedMapUnity.unitPool[i] != null && choosedMapUnity.unitPool[i].whoColour == Name.NodeColor.Metal) + { + choosedMapUnity.unitPool[i].whoColour = Name.NodeColor.White; + choosedMapUnity.unitPool[i].ChengePlan(); + } + } + + // StartCoroutine(IsColorDone(0.1f)); } @@ -384,5 +403,84 @@ public class ForgintPointManager : Singleton } } - + //ˢ¶ؿ + public void RefreshColorMap() + { + HashSet mapHasSet = new HashSet(); + HashSet colorHasSet = new HashSet(); + //ɫ + for (int i=0;i cubeList = new List<(int, int, int)>(); + int intEuler = (int)euler; + for (int i = 0; i < cardOriginalData.nodesMark.Length; i++) + { + + try + { + string[] marks = cardOriginalData.nodesMark[i].Split("_"); + //Debug.Log("AxialToCubeX" + int.Parse(marks[0]) + "AxialToCubeY" + int.Parse(marks[1])); + (int q, int s, int y) = MathTool.AxialToCube(int.Parse(marks[0]), int.Parse(marks[1])); + cubeList.Add((q, s, y)); + } + catch (Exception e) + { } + } + List<(int, int, int)> rotatedCubeList = new List<(int, int, int)>(); + rotatedCubeList = MathTool.RotateCoordinates(cubeList, intEuler); + foreach (var tuple in rotatedCubeList) + { + MapUnity endNode = null; + endNode = getNodeTools.getNodeWithCube(tuple.Item1, tuple.Item2, tuple.Item3); + + } + + + List<(int, int, int)> trueCubeList = new List<(int, int, int)>(); + trueCubeList = MathTool.TranslateHexesToNewOrigin(rotatedCubeList, (targetNode.cubeQ, targetNode.cubeS, targetNode.cubeR)); + for (int i = 0; i < trueCubeList.Count; i++) + { + MapUnity endNode = null; + endNode = getNodeTools.getNodeWithCube(trueCubeList[i].Item1, trueCubeList[i].Item2, trueCubeList[i].Item3); + if (endNode != null) + { + endNode.switchColor(Name.stringColorToint(cardOriginalData.nodesColor[i])); + mapHasSet .Remove (endNode); + colorHasSet .Add (endNode); + } + } + + foreach (MapUnity mapUnity in mapHasSet ) + { + mapUnity .whoColour = Name.NodeColor.Metal; + mapUnity.ChengePlan(); + } + foreach (MapUnity mapUnity in colorHasSet) + { + //ͷٽ粻Ⱦɫ + for (int i = 0; i < mapUnity.unitPool.Count; i++) + { + if (mapUnity.unitPool[i] != null && mapUnity.unitPool[i].whoColour == Name.NodeColor.Metal) + { + mapUnity.unitPool[i].whoColour = Name.NodeColor.White; + mapUnity.unitPool[i].ChengePlan(); + } + } + } + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs index c2878fd4..7fa680fd 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs @@ -40,6 +40,7 @@ public class MapUnity : MonoBehaviour public List blueColour = new List(); public List blackColour = new List(); public List whiteColour = new List(); + public List metalColour = new List(); public GameObject colourGameObject; public Animator anim; @@ -189,7 +190,7 @@ public class MapUnity : MonoBehaviour RefreshWhoColor(); }*/ - //Debug.DrawRay(touchRayStartPoint .position,touchRayStartPoint .right, Color.green ,2f); + // Debug.DrawRay(touchRayStartPoint .position,touchRayStartPoint .right, Color.green ,2f); } public void switchColor(int newColor) @@ -253,7 +254,7 @@ public class MapUnity : MonoBehaviour public void ConnectUnit() { for (int i = 0; i < 6; i++) - { + { if (Physics.Raycast(touchRayStartPoint.position, touchRayStartPoint.right, out RaycastHit raycastHit, 2f, touchLayerMask.value)) { unitPool [i] = raycastHit.transform.GetComponent(); @@ -464,6 +465,10 @@ public class MapUnity : MonoBehaviour { colourGameObject.GetComponent().material = whiteColour[UnityEngine.Random.Range(0, whiteColour.Count)]; } + else if (whoColour == Name.NodeColor.Metal ) + { + colourGameObject.GetComponent().material = metalColour[UnityEngine.Random.Range(0, metalColour.Count)]; + } } public void ParticlePlay() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs index ad0e1292..62b6701b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs @@ -143,7 +143,25 @@ public class getNodeTools { mapUnity=null; } - + //nodeбĵڼλ--- + try + { + for (int i = 0; i