diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset index b86ffdc9..966737f9 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset @@ -13,13 +13,13 @@ MonoBehaviour: m_Name: cardDeckList m_EditorClassIdentifier: cardDeckList: - - 1007 - - 1007 - - 1007 - - 1007 - - 1007 - - 1007 - - 1007 - - 1007 - - 1007 - - 1005 + - 1006 + - 1006 + - 1006 + - 1006 + - 1006 + - 1006 + - 1006 + - 1006 + - 1006 + - 1006 diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景.png b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景.png new file mode 100644 index 00000000..4e94dddb Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/图层 1.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景.png.meta similarity index 98% rename from ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/图层 1.png.meta rename to ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景.png.meta index 9cfc274e..811b29c7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/图层 1.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7a10e1a360c460f4e84f87d06094a346 +guid: 0436c8be5d207c54985c006ec4d79284 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景右柱子.png b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景右柱子.png new file mode 100644 index 00000000..1841d0c2 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景右柱子.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/ai背景2.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景右柱子.png.meta similarity index 98% rename from ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/ai背景2.png.meta rename to ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景右柱子.png.meta index 015ccff6..a20513fa 100644 --- a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/ai背景2.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景右柱子.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5147832cd40d13946b5f13f97dc11a35 +guid: 57a1e6d0a2012804f8f8c0ebdf56844a TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景左柱子.png b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景左柱子.png new file mode 100644 index 00000000..d7934e0b Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景左柱子.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/0D1C887344E6DDEF00DCABCB2EAFB76B.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景左柱子.png.meta similarity index 98% rename from ColorlessWorld-2024-4-2/Assets/Materials/Map/0D1C887344E6DDEF00DCABCB2EAFB76B.png.meta rename to ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景左柱子.png.meta index 639136c7..cb105796 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/0D1C887344E6DDEF00DCABCB2EAFB76B.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/AI背景左柱子.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b9e377866ad42f44eabc929866b89f7d +guid: 1fb9e6884b6bfcd438faf165fe7659bd TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/ai背景2.png b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/ai背景2.png deleted file mode 100644 index d505fec6..00000000 Binary files a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/ai背景2.png and /dev/null differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/ai背景2_1.png b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/ai背景2_1.png deleted file mode 100644 index b85ba991..00000000 Binary files a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/ai背景2_1.png and /dev/null differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/图层 1.png b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/图层 1.png deleted file mode 100644 index 2f50e1ac..00000000 Binary files a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/图层 1.png and /dev/null differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/BackGround.mat b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/BackGround.mat index d624078f..10d113d3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/BackGround.mat +++ b/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/卡子-学院/BackGround.mat @@ -65,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 7a10e1a360c460f4e84f87d06094a346, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/0D1C887344E6DDEF00DCABCB2EAFB76B.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/0D1C887344E6DDEF00DCABCB2EAFB76B.png deleted file mode 100644 index 38cc209c..00000000 Binary files a/ColorlessWorld-2024-4-2/Assets/Materials/Map/0D1C887344E6DDEF00DCABCB2EAFB76B.png and /dev/null differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-3.mat.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块.meta similarity index 52% rename from ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-3.mat.meta rename to ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块.meta index 47fb27ab..00ed542a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-3.mat.meta +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: a810fde45b6f6b94ab180e35aa3c20ff -NativeFormatImporter: +guid: 3e29108b357795848891c3fb6a602ac7 +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/污染地块1.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/污染地块1.png new file mode 100644 index 00000000..7cb7a12e Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/污染地块1.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/ai背景2_1.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/污染地块1.png.meta similarity index 98% rename from ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/ai背景2_1.png.meta rename to ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/污染地块1.png.meta index 409ea0af..da96f4bc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Image/2D新场景/AI/ai背景2_1.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/污染地块1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9928c28a9b00f034686b332601d7b459 +guid: 43f5d0ceb4b875d45989953576e2619c TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/污染地块2.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/污染地块2.png new file mode 100644 index 00000000..031a4fff Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/污染地块2.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/污染地块2.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/污染地块2.png.meta new file mode 100644 index 00000000..a415c3ac --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/污染地块2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 4b7287d84c9f79048a2a54a8c0a0e2c9 +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/Materials/Map/AI地块/白地块1.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块1.png new file mode 100644 index 00000000..e6c298db Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块1.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块1.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块1.png.meta new file mode 100644 index 00000000..f0471ef3 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块1.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 57583855e68d5b04b8568442251ef61d +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/Materials/Map/AI地块/白地块2.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块2.png new file mode 100644 index 00000000..573c4fc6 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块2.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块2.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块2.png.meta new file mode 100644 index 00000000..dc20b26b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: efe04a796da1abd42a9622451d56a1f1 +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/Materials/Map/AI地块/白地块3.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块3.png new file mode 100644 index 00000000..7e1746e6 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块3.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块3.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块3.png.meta new file mode 100644 index 00000000..64526292 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/白地块3.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 6d37c87c48412b04d904e239ca91edda +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/Materials/Map/AI地块/红色地块1.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块1.png new file mode 100644 index 00000000..5654e654 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块1.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块1.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块1.png.meta new file mode 100644 index 00000000..98eac505 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块1.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 3f58d18ce69261f468a8b9f6f2a3c211 +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/Materials/Map/AI地块/红色地块2.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块2.png new file mode 100644 index 00000000..ce1779e9 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块2.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块2.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块2.png.meta new file mode 100644 index 00000000..99fa9b6e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: cc9d8147cc5c6544d83c541072a6c40b +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/Materials/Map/AI地块/红色地块3.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块3.png new file mode 100644 index 00000000..34db37fe Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块3.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块3.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块3.png.meta new file mode 100644 index 00000000..8913b277 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块3.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 602c0dc0fe03b0546aff28cad20014b7 +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/Materials/Map/AI地块/红色地块4.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块4.png new file mode 100644 index 00000000..9fa016ba Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块4.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块4.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块4.png.meta new file mode 100644 index 00000000..288c1830 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/红色地块4.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 89135f9e1342d4447ad686d484f748ed +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/Materials/Map/AI地块/绿色地块1.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/绿色地块1.png new file mode 100644 index 00000000..dc36d017 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/绿色地块1.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/绿色地块1.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/绿色地块1.png.meta new file mode 100644 index 00000000..a9994235 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/绿色地块1.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9048785e752130e4bbe398b614d90c44 +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/Materials/Map/AI地块/绿色地块2.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/绿色地块2.png new file mode 100644 index 00000000..17a28f29 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/绿色地块2.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/绿色地块2.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/绿色地块2.png.meta new file mode 100644 index 00000000..ac931a58 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/绿色地块2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 00eee0ce56229ef41bd62f90d5aa8144 +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/Materials/Map/AI地块/蓝色地块1.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/蓝色地块1.png new file mode 100644 index 00000000..67a3ea4a Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/蓝色地块1.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/蓝色地块1.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/蓝色地块1.png.meta new file mode 100644 index 00000000..02c18654 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/AI地块/蓝色地块1.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 4b8f9a75e8e302547965ca444df9eda9 +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/Materials/Map/BBCA137E1BAD4DCB3B75B3FFFAD281E9.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/BBCA137E1BAD4DCB3B75B3FFFAD281E9.png deleted file mode 100644 index 828d1899..00000000 Binary files a/ColorlessWorld-2024-4-2/Assets/Materials/Map/BBCA137E1BAD4DCB3B75B3FFFAD281E9.png and /dev/null differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/BBCA137E1BAD4DCB3B75B3FFFAD281E9.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/BBCA137E1BAD4DCB3B75B3FFFAD281E9.png.meta deleted file mode 100644 index 1d41a0e5..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/BBCA137E1BAD4DCB3B75B3FFFAD281E9.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 0446dc43da439c744bddcfd109447ea8 -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/Materials/Map/BlackMap-1 1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/BlackMap-1 1.mat index 9ada246e..b5fb5d20 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: ef863a289d6ce92499fccc8f7e45a790, type: 3} + m_Texture: {fileID: 2800000, guid: 4b7287d84c9f79048a2a54a8c0a0e2c9, 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: ef863a289d6ce92499fccc8f7e45a790, type: 3} + m_Texture: {fileID: 2800000, guid: 4b7287d84c9f79048a2a54a8c0a0e2c9, 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/BlackMap-1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/BlackMap-1.mat index 4d1940ce..c7b7d020 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/BlackMap-1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/BlackMap-1.mat @@ -25,9 +25,10 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3001 @@ -41,7 +42,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: cb1d88127e421da4c9be4ce96e438ec7, type: 3} + m_Texture: {fileID: 2800000, guid: 43f5d0ceb4b875d45989953576e2619c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -65,7 +66,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: cb1d88127e421da4c9be4ce96e438ec7, type: 3} + m_Texture: {fileID: 2800000, guid: 43f5d0ceb4b875d45989953576e2619c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -131,6 +132,6 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.13341635, g: 0.008181195, b: 0.10070565, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/DFEB301DAFBD2249A77CC707DB8351DF.png b/ColorlessWorld-2024-4-2/Assets/Materials/Map/DFEB301DAFBD2249A77CC707DB8351DF.png deleted file mode 100644 index 6818aaea..00000000 Binary files a/ColorlessWorld-2024-4-2/Assets/Materials/Map/DFEB301DAFBD2249A77CC707DB8351DF.png and /dev/null differ diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/DFEB301DAFBD2249A77CC707DB8351DF.png.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/DFEB301DAFBD2249A77CC707DB8351DF.png.meta deleted file mode 100644 index 57540025..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/DFEB301DAFBD2249A77CC707DB8351DF.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 942a7d5c4d3035c4b9b47d12e8f086b2 -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/Materials/Map/FireMap-1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-1.mat index 8f8d8574..bcb59752 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-1.mat @@ -41,7 +41,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 981748b12f9371548b9c69073d83825d, type: 3} + m_Texture: {fileID: 2800000, guid: 3f58d18ce69261f468a8b9f6f2a3c211, 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: 981748b12f9371548b9c69073d83825d, type: 3} + m_Texture: {fileID: 2800000, guid: 3f58d18ce69261f468a8b9f6f2a3c211, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -131,6 +131,6 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.24014945, g: 0.054373465, b: 0.030585071, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-2.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-2.mat index 16d72473..0e867edc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-2.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-2.mat @@ -41,7 +41,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: c40741c2ba69ee24fb1e00c8f9716240, type: 3} + m_Texture: {fileID: 2800000, guid: cc9d8147cc5c6544d83c541072a6c40b, 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: c40741c2ba69ee24fb1e00c8f9716240, type: 3} + m_Texture: {fileID: 2800000, guid: cc9d8147cc5c6544d83c541072a6c40b, 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.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3.mat index 01334e93..43d49cc5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3.mat @@ -41,7 +41,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 3edb33959ec5f8143a7def02c22997c0, type: 3} + m_Texture: {fileID: 2800000, guid: 602c0dc0fe03b0546aff28cad20014b7, 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: 3edb33959ec5f8143a7def02c22997c0, type: 3} + m_Texture: {fileID: 2800000, guid: 602c0dc0fe03b0546aff28cad20014b7, 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-4.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-4.mat index 35833e9c..baeb99f5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-4.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-4.mat @@ -21,25 +21,27 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: FireMap-4 - m_Shader: {fileID: -6465566751694194690, guid: 35bad165eb5f5214db0d3cfa11cf1c8a, - type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: + m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3001 - stringTagMap: {} - disabledShaderPasses: [] + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 529e6b05197ee194697e1a1287ce6354, type: 3} + m_Texture: {fileID: 2800000, guid: 89135f9e1342d4447ad686d484f748ed, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -63,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 529e6b05197ee194697e1a1287ce6354, type: 3} + m_Texture: {fileID: 2800000, guid: 89135f9e1342d4447ad686d484f748ed, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -82,10 +84,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _Texture2D: - m_Texture: {fileID: 2800000, guid: 529e6b05197ee194697e1a1287ce6354, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -117,12 +115,10 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _LerpProgress: 0 - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueControl: 0 - - _QueueOffset: 1 + - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 @@ -137,5 +133,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - - _offset: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-4.mat.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-4.mat.meta index fc549a99..58d95032 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-4.mat.meta +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-4.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9e1784c3f771f044e89b8fc660b42950 +guid: bdc5ecbef32d5744caf53b7b2692cf5d NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3 1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-5.mat similarity index 83% rename from ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3 1.mat rename to ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-5.mat index b9c0b5ea..04525380 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3 1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-5.mat @@ -20,28 +20,26 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: FireMap-3 1 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Name: FireMap-5 + m_Shader: {fileID: -6465566751694194690, guid: 35bad165eb5f5214db0d3cfa11cf1c8a, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER + m_CustomRenderQueue: 3001 + stringTagMap: {} + disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 50e234f90a1d680478995f82ffe827df, type: 3} + m_Texture: {fileID: 2800000, guid: 529e6b05197ee194697e1a1287ce6354, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -65,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 50e234f90a1d680478995f82ffe827df, type: 3} + m_Texture: {fileID: 2800000, guid: 529e6b05197ee194697e1a1287ce6354, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -84,6 +82,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Texture2D: + m_Texture: {fileID: 2800000, guid: 529e6b05197ee194697e1a1287ce6354, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -115,10 +117,12 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 + - _LerpProgress: 0 - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueOffset: 0 + - _QueueControl: 0 + - _QueueOffset: 1 - _ReceiveShadows: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 @@ -133,4 +137,5 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _offset: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3 1.mat.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-5.mat.meta similarity index 79% rename from ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3 1.mat.meta rename to ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-5.mat.meta index 58d95032..fc549a99 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3 1.mat.meta +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-5.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bdc5ecbef32d5744caf53b7b2692cf5d +guid: 9e1784c3f771f044e89b8fc660b42950 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-1.mat index 8d277d90..ebba2553 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-1.mat @@ -28,7 +28,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: a0ca6ef726024a0459559174b68cb989, type: 3} + m_Texture: {fileID: 2800000, guid: 9048785e752130e4bbe398b614d90c44, 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: a0ca6ef726024a0459559174b68cb989, type: 3} + m_Texture: {fileID: 2800000, guid: 9048785e752130e4bbe398b614d90c44, 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-2.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-2.mat index 8618165c..e9487706 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-2.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-2.mat @@ -28,7 +28,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: cc399ccd6a80e2348bd7fecba8788159, type: 3} + m_Texture: {fileID: 2800000, guid: 00eee0ce56229ef41bd62f90d5aa8144, 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: cc399ccd6a80e2348bd7fecba8788159, type: 3} + m_Texture: {fileID: 2800000, guid: 00eee0ce56229ef41bd62f90d5aa8144, 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-3.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-3.mat deleted file mode 100644 index aa9912e8..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-3.mat +++ /dev/null @@ -1,136 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: GlassMap-3 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: 0974efc85d0f5e4499e4e8268b66cc08, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 0974efc85d0f5e4499e4e8268b66cc08, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 0 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _DstBlendAlpha: 10 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _SrcBlendAlpha: 1 - - _Surface: 1 - - _WorkflowMode: 1 - - _ZWrite: 0 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] ---- !u!114 &7621213955381800362 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-4.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-4.mat deleted file mode 100644 index b4d7b498..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-4.mat +++ /dev/null @@ -1,136 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: GlassMap-4 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: 0446dc43da439c744bddcfd109447ea8, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 0446dc43da439c744bddcfd109447ea8, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 0 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _DstBlendAlpha: 10 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _SrcBlendAlpha: 1 - - _Surface: 1 - - _WorkflowMode: 1 - - _ZWrite: 0 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] ---- !u!114 &7621213955381800362 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-4.mat.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-4.mat.meta deleted file mode 100644 index f0a745a7..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-4.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fe97adae8312a0442a717eb834e06687 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: 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 deleted file mode 100644 index 95ccd61b..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5 1.mat +++ /dev/null @@ -1,136 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: GlassMap-5 1 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: 6288ce9a23e30424bb06dd1fe5a3b3bd, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 6288ce9a23e30424bb06dd1fe5a3b3bd, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 0 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _DstBlendAlpha: 10 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _SrcBlendAlpha: 1 - - _Surface: 1 - - _WorkflowMode: 1 - - _ZWrite: 0 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] ---- !u!114 &7621213955381800362 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5 1.mat.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5 1.mat.meta deleted file mode 100644 index 00011d39..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5 1.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bb22da91b7f838749b8ec6dcee6be5d3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5.mat deleted file mode 100644 index 3f08b3fc..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5.mat +++ /dev/null @@ -1,136 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: GlassMap-5 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: 942a7d5c4d3035c4b9b47d12e8f086b2, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 942a7d5c4d3035c4b9b47d12e8f086b2, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 0 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _DstBlendAlpha: 10 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _SrcBlendAlpha: 1 - - _Surface: 1 - - _WorkflowMode: 1 - - _ZWrite: 0 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] ---- !u!114 &7621213955381800362 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5.mat.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5.mat.meta deleted file mode 100644 index 2b0cd26b..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 516ce65556affca4a9174205248d1217 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-1.mat index 1088f7d6..13739327 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-1.mat @@ -41,7 +41,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 260856292e6be62478629aebcd8d10a9, type: 3} + m_Texture: {fileID: 2800000, guid: 4b8f9a75e8e302547965ca444df9eda9, 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: 260856292e6be62478629aebcd8d10a9, type: 3} + m_Texture: {fileID: 2800000, guid: 4b8f9a75e8e302547965ca444df9eda9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -129,8 +129,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.41509432, g: 0.41509432, b: 0.41509432, a: 1} - - _Color: {r: 0.4150943, g: 0.4150943, b: 0.4150943, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] 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 deleted file mode 100644 index 86b8a7b2..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-2 1.mat +++ /dev/null @@ -1,136 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-6106161968466716456 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: WaterMap-2 1 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: b83f739e3f406334c8ff18eb9ab1cf30, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: b83f739e3f406334c8ff18eb9ab1cf30, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 0 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _DstBlendAlpha: 10 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _SrcBlendAlpha: 1 - - _Surface: 1 - - _WorkflowMode: 1 - - _ZWrite: 0 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-2 1.mat.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-2 1.mat.meta deleted file mode 100644 index 764b56b4..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WaterMap-2 1.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3fb6bc156c78b934a940ff5e82926e27 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WhiteMap 1.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WhiteMap 1.mat index 80864b11..dc83e40f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WhiteMap 1.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WhiteMap 1.mat @@ -41,7 +41,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: ff571db7d84dfe949a5fbba7c90a3005, type: 3} + m_Texture: {fileID: 2800000, guid: efe04a796da1abd42a9622451d56a1f1, 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: ff571db7d84dfe949a5fbba7c90a3005, type: 3} + m_Texture: {fileID: 2800000, guid: efe04a796da1abd42a9622451d56a1f1, 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/WhiteMap 2.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WhiteMap 2.mat index 5afaa3bd..a1bd672f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WhiteMap 2.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WhiteMap 2.mat @@ -41,7 +41,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 4dece88711fcd344a8cda481ac9d2042, type: 3} + m_Texture: {fileID: 2800000, guid: 6d37c87c48412b04d904e239ca91edda, 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: 4dece88711fcd344a8cda481ac9d2042, type: 3} + m_Texture: {fileID: 2800000, guid: 6d37c87c48412b04d904e239ca91edda, 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/WhiteMap.mat b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WhiteMap.mat index 23feeb3a..f79a2337 100644 --- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/WhiteMap.mat +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/WhiteMap.mat @@ -41,7 +41,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 5596c26a3a0067644819d7da94ea6afe, type: 3} + m_Texture: {fileID: 2800000, guid: 57583855e68d5b04b8568442251ef61d, 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: 5596c26a3a0067644819d7da94ea6afe, type: 3} + m_Texture: {fileID: 2800000, guid: 57583855e68d5b04b8568442251ef61d, 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 7ddd8e2a..692bbbdd 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab @@ -573,17 +573,23 @@ MonoBehaviour: castPreRange: {fileID: 2100000, guid: e4d58776fca90ec49aa2c7d259c73e27, type: 2} enemyMark: {fileID: 2100000, guid: 5bc9b4d525fc54344935f187546b718b, type: 2} greenColour: - - {fileID: 2100000, guid: e915b9364c3f1ec4398fe7cfeb2e8a1f, type: 2} + - {fileID: 2100000, guid: 4e4ed06d8c8354847bcf2ca66a5513d2, type: 2} + - {fileID: 2100000, guid: 31f453325a3fdef40bba8d312c863b5f, type: 2} redColour: - - {fileID: 2100000, guid: e915b9364c3f1ec4398fe7cfeb2e8a1f, type: 2} + - {fileID: 2100000, guid: 152a4cd5bb62b0543912f5ba48e57380, type: 2} + - {fileID: 2100000, guid: 8f63245a0a3bd9a4eb148dab7e3c48d9, type: 2} + - {fileID: 2100000, guid: bdc5ecbef32d5744caf53b7b2692cf5d, type: 2} blueColour: - - {fileID: 2100000, guid: e915b9364c3f1ec4398fe7cfeb2e8a1f, type: 2} + - {fileID: 2100000, guid: 32ab47c8bed7f8349a6567b550088223, type: 2} blackColour: - - {fileID: 2100000, guid: e915b9364c3f1ec4398fe7cfeb2e8a1f, type: 2} + - {fileID: 2100000, guid: d2ca8ff7440602f4a8db5e20ee44031d, type: 2} + - {fileID: 2100000, guid: c2429528f9a1e1d46af929d9b1fd6075, type: 2} whiteColour: - - {fileID: 2100000, guid: e915b9364c3f1ec4398fe7cfeb2e8a1f, type: 2} + - {fileID: 2100000, guid: c5e28933480f51e4bbc1033400da7127, type: 2} + - {fileID: 2100000, guid: d946b9fa91d2a1e4fbcdee4fedbdc4ff, type: 2} + - {fileID: 2100000, guid: 22bb7b19935ae064fb7e45078bf0e273, type: 2} metalColour: - - {fileID: 2100000, guid: 32ab47c8bed7f8349a6567b550088223, type: 2} + - {fileID: 2100000, guid: 4797418ad4e1fc047b85403cc62a270f, type: 2} colourGameObject: {fileID: 7818877686521749494} anim: {fileID: 1919482280699867709} planePoint: {fileID: 20513801652698109} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 6c6a8bb1..5a52e3ea 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -7033,8 +7033,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915} - m_LocalPosition: {x: 4.28, y: 13.49, z: -1.09} + m_LocalRotation: {x: 0.5, y: 0, z: 0, w: 0.8660254} + m_LocalPosition: {x: 3.31, y: 13.07, z: -5.25} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8941,7 +8941,7 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 5 + m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -8999,13 +8999,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 410087039} serializedVersion: 2 - m_LocalRotation: {x: 0.98490566, y: 0.004624467, z: 0.009200674, w: 0.1727856} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 19.893, y: 178.798, z: 179.251} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!114 &410087042 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15820,15 +15820,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 699857786} serializedVersion: 2 - m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915} - m_LocalPosition: {x: 4.28, y: 13.49, z: -1.09} + m_LocalRotation: {x: 0.5, y: 0, z: 0, w: 0.8660254} + m_LocalPosition: {x: 3.31, y: 13.07, z: -5.25} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 328654747} - {fileID: 1098880431} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0} --- !u!114 &699857789 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16419,6 +16419,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 725512355} m_CullTransparentMesh: 1 +--- !u!1 &729399550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 729399551} + - component: {fileID: 729399553} + - component: {fileID: 729399552} + m_Layer: 0 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &729399551 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 729399550} + 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: 1876395448} + 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: -254, y: -210} + m_SizeDelta: {x: 117, y: 157} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &729399552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 729399550} + 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: 1fb9e6884b6bfcd438faf165fe7659bd, 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 &729399553 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 729399550} + m_CullTransparentMesh: 1 --- !u!1 &732732825 GameObject: m_ObjectHideFlags: 0 @@ -19826,7 +19901,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 904284327} 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.000011668} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -19834,7 +19909,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.000061035156, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &904284329 @@ -19857,7 +19932,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5147832cd40d13946b5f13f97dc11a35, type: 3} + m_Sprite: {fileID: 21300000, guid: 0436c8be5d207c54985c006ec4d79284, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -25375,6 +25450,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1195351654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1195351655} + - component: {fileID: 1195351657} + - component: {fileID: 1195351656} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1195351655 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1195351654} + 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: 1876395448} + 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: 162, y: -238} + m_SizeDelta: {x: 132, y: 137} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1195351656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1195351654} + 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: 57a1e6d0a2012804f8f8c0ebdf56844a, 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 &1195351657 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1195351654} + m_CullTransparentMesh: 1 --- !u!1 &1199482893 GameObject: m_ObjectHideFlags: 0 @@ -27628,8 +27778,6 @@ MonoBehaviour: - Y: [] - Y: [] - Y: [] - - Y: [] - - Y: [] character: 0 playerOn: {fileID: 0} player: {fileID: 1809205617} @@ -31743,7 +31891,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.5999756, y: 916.9} + m_AnchoredPosition: {x: 0.5998535, y: 916.9} m_SizeDelta: {x: 419.5, y: 169.82} m_Pivot: {x: 0, y: 0} --- !u!114 &1504140804 @@ -42727,10 +42875,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mapUnity: {fileID: 887005656701010215, guid: ecde4b12dc4538b4caff9ada56c9ab30, type: 3} - line: 11 - column: 8 + line: 9 + column: 6 generatePoint: {fileID: 514899946} - lineOffSet: {x: 1.4, y: 0, z: 0} + lineOffSet: {x: 1.35, y: 0, z: 0} columnOffSet: {x: 0, y: 0, z: 0.815} enemyGenerateDataList: - enemyPrefab: {fileID: 1253231568001379261, guid: cd51de58fa2114447b96f63a1bf19b5c, @@ -44816,7 +44964,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1195351655} + - {fileID: 729399551} m_Father: {fileID: 372793782} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -44837,7 +44987,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 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs index e623ebfb..48a6db3f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs @@ -446,6 +446,7 @@ public class MapUnity : MonoBehaviour } public void ChengePlan() { + colourGameObject.SetActive(true); if (whoColour == Name.NodeColor.Green) { colourGameObject.GetComponent().material = greenColour[UnityEngine.Random.Range(0, greenColour.Count)]; @@ -464,7 +465,8 @@ public class MapUnity : MonoBehaviour } else if (whoColour == Name.NodeColor.White) { - colourGameObject.GetComponent().material = whiteColour[UnityEngine.Random.Range(0, whiteColour.Count)]; + // colourGameObject.GetComponent().material = whiteColour[UnityEngine.Random.Range(0, whiteColour.Count)]; + colourGameObject.SetActive(false); } else if (whoColour == Name.NodeColor.Metal ) { @@ -478,32 +480,32 @@ public class MapUnity : MonoBehaviour case Name.NodeColor.Green: var greenPartical = Instantiate(ParticalManager.Instance.greenParticleEffect, planePoint.position, ParticalManager.Instance.greenParticleEffect.transform.rotation); greenPartical.transform.SetParent(transform); - mapGameObject.SetActive(false); - whoColourPlane.SetActive(true); + // mapGameObject.SetActive(false); + // whoColourPlane.SetActive(true); break; case Name.NodeColor.Blue: var bluePartical = Instantiate(ParticalManager.Instance.blueParticleEffect, planePoint.position, ParticalManager.Instance.blueParticleEffect.transform.rotation); bluePartical.transform.SetParent(transform); - mapGameObject.SetActive(false); - whoColourPlane.SetActive(true); + // mapGameObject.SetActive(false); + // whoColourPlane.SetActive(true); break; case Name.NodeColor.Red: var redPartical = Instantiate(ParticalManager.Instance.redParticleEffect, planePoint.position, ParticalManager.Instance.redParticleEffect.transform.rotation); redPartical.transform.SetParent(transform); - mapGameObject.SetActive(false); - whoColourPlane.SetActive(true); + // mapGameObject.SetActive(false); + // whoColourPlane.SetActive(true); break; case Name.NodeColor.Black: var blackPartical = Instantiate(ParticalManager.Instance.blueParticleEffect, planePoint.position, ParticalManager.Instance.blueParticleEffect.transform.rotation); blackPartical.transform.SetParent(transform); - mapGameObject.SetActive(false); - whoColourPlane.SetActive(true); + // mapGameObject.SetActive(false); + // whoColourPlane.SetActive(true); break; case Name.NodeColor.White: var whitePartical = Instantiate(ParticalManager.Instance.blueParticleEffect, planePoint.position, ParticalManager.Instance.blueParticleEffect.transform.rotation); whitePartical.transform.SetParent(transform); - mapGameObject.SetActive(false); - whoColourPlane.SetActive(true); + // mapGameObject.SetActive(false); + // whoColourPlane.SetActive(true); break; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Settings/SampleSceneProfile.asset b/ColorlessWorld-2024-4-2/Assets/Settings/SampleSceneProfile.asset index 5b8451c4..7e747237 100644 --- a/ColorlessWorld-2024-4-2/Assets/Settings/SampleSceneProfile.asset +++ b/ColorlessWorld-2024-4-2/Assets/Settings/SampleSceneProfile.asset @@ -21,7 +21,7 @@ MonoBehaviour: m_Value: 1 intensity: m_OverrideState: 1 - m_Value: 0.5 + m_Value: 1.5 scatter: m_OverrideState: 0 m_Value: 0.7