diff --git a/Assets/3dModels/Killcave/textures/NewLayer.terrainlayer b/Assets/3dModels/Killcave/textures/NewLayer.terrainlayer new file mode 100644 index 0000000..a161d01 --- /dev/null +++ b/Assets/3dModels/Killcave/textures/NewLayer.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NewLayer + m_DiffuseTexture: {fileID: 2800000, guid: 9db5f1465013bcd489fc69ad52e29706, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: 7180446c96359a74ca4d7397b54583a9, type: 3} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 10, y: 10} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Metallic: 0 + m_Smoothness: 0 + m_NormalScale: 2 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Assets/3dModels/Killcave/textures/NewLayer.terrainlayer.meta b/Assets/3dModels/Killcave/textures/NewLayer.terrainlayer.meta new file mode 100644 index 0000000..df2aaa6 --- /dev/null +++ b/Assets/3dModels/Killcave/textures/NewLayer.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a4144f790c7c0444bb0670c28722c3d9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8574412962073106934 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/New Terrain 2.asset b/Assets/New Terrain 2.asset new file mode 100644 index 0000000..60660d6 Binary files /dev/null and b/Assets/New Terrain 2.asset differ diff --git a/Assets/New Terrain 2.asset.meta b/Assets/New Terrain 2.asset.meta new file mode 100644 index 0000000..0f485ff --- /dev/null +++ b/Assets/New Terrain 2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8511ef948884a8940a99ffe42039c421 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 15600000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/killcave.unity b/Assets/Scenes/killcave.unity index 6fd4eaa..67d9aeb 100644 --- a/Assets/Scenes/killcave.unity +++ b/Assets/Scenes/killcave.unity @@ -569,6 +569,11 @@ PrefabInstance: propertyPath: m_Name value: floor objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 2b47b54a1a78d0a4781fc391d2d599be, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 2b47b54a1a78d0a4781fc391d2d599be, type: 3} propertyPath: m_StaticEditorFlags @@ -593,7 +598,7 @@ MeshCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 4 - m_Convex: 1 + m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4360741404903036949, guid: 2b47b54a1a78d0a4781fc391d2d599be, type: 3} --- !u!1 &698140333 stripped @@ -793,6 +798,82 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -6874835119374649294, guid: 7a882ff012a46114a8afb24c4068951c, type: 3} +--- !u!1 &895333520 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 895333523} + - component: {fileID: 895333522} + - component: {fileID: 895333521} + m_Layer: 0 + m_Name: Terrain + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!154 &895333521 +TerrainCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895333520} + m_Material: {fileID: 0} + m_Enabled: 1 + m_TerrainData: {fileID: 15600000, guid: 8511ef948884a8940a99ffe42039c421, type: 2} + m_EnableTreeColliders: 1 +--- !u!218 &895333522 +Terrain: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895333520} + m_Enabled: 1 + serializedVersion: 6 + m_TerrainData: {fileID: 15600000, guid: 8511ef948884a8940a99ffe42039c421, type: 2} + m_TreeDistance: 5000 + m_TreeBillboardDistance: 50 + m_TreeCrossFadeLength: 5 + m_TreeMaximumFullLODCount: 50 + m_DetailObjectDistance: 80 + m_DetailObjectDensity: 1 + m_HeightmapPixelError: 5 + m_SplatMapDistance: 1000 + m_HeightmapMaximumLOD: 0 + m_ShadowCastingMode: 2 + m_DrawHeightmap: 1 + m_DrawInstanced: 0 + m_DrawTreesAndFoliage: 1 + m_ReflectionProbeUsage: 1 + m_MaterialTemplate: {fileID: 10652, guid: 0000000000000000f000000000000000, type: 0} + m_BakeLightProbesForTrees: 1 + m_PreserveTreePrototypeLayers: 0 + m_DeringLightProbesForTrees: 1 + m_ScaleInLightmap: 0.0256 + m_LightmapParameters: {fileID: 15200, guid: 0000000000000000f000000000000000, type: 0} + m_GroupingID: 0 + m_RenderingLayerMask: 1 + m_AllowAutoConnect: 1 +--- !u!4 &895333523 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895333520} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -18.68, y: 0, z: -30.42} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &925095044 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5505924225009591588, guid: 7a882ff012a46114a8afb24c4068951c, diff --git a/Assets/Scenes/killcave/LightingData.asset b/Assets/Scenes/killcave/LightingData.asset index 8f65781..43ba821 100644 Binary files a/Assets/Scenes/killcave/LightingData.asset and b/Assets/Scenes/killcave/LightingData.asset differ diff --git a/Assets/Scenes/killcave/Lightmap-0_comp_dir.png b/Assets/Scenes/killcave/Lightmap-0_comp_dir.png index 525a8db..01c12fd 100644 Binary files a/Assets/Scenes/killcave/Lightmap-0_comp_dir.png and b/Assets/Scenes/killcave/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/killcave/Lightmap-0_comp_light.exr b/Assets/Scenes/killcave/Lightmap-0_comp_light.exr index deaba72..31acb8a 100644 Binary files a/Assets/Scenes/killcave/Lightmap-0_comp_light.exr and b/Assets/Scenes/killcave/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/killcave/Lightmap-0_comp_shadowmask.png b/Assets/Scenes/killcave/Lightmap-0_comp_shadowmask.png index 12082fd..9de82f4 100644 Binary files a/Assets/Scenes/killcave/Lightmap-0_comp_shadowmask.png and b/Assets/Scenes/killcave/Lightmap-0_comp_shadowmask.png differ diff --git a/Assets/Scenes/killcave/Lightmap-1_comp_dir.png b/Assets/Scenes/killcave/Lightmap-1_comp_dir.png index 868ede3..8a5d299 100644 Binary files a/Assets/Scenes/killcave/Lightmap-1_comp_dir.png and b/Assets/Scenes/killcave/Lightmap-1_comp_dir.png differ diff --git a/Assets/Scenes/killcave/Lightmap-1_comp_light.exr b/Assets/Scenes/killcave/Lightmap-1_comp_light.exr index e4af7fd..7474a73 100644 Binary files a/Assets/Scenes/killcave/Lightmap-1_comp_light.exr and b/Assets/Scenes/killcave/Lightmap-1_comp_light.exr differ diff --git a/Assets/Scenes/killcave/Lightmap-1_comp_shadowmask.png b/Assets/Scenes/killcave/Lightmap-1_comp_shadowmask.png index 64450d4..a2b5a5f 100644 Binary files a/Assets/Scenes/killcave/Lightmap-1_comp_shadowmask.png and b/Assets/Scenes/killcave/Lightmap-1_comp_shadowmask.png differ diff --git a/Assets/Scenes/killcave/Lightmap-2_comp_dir.png b/Assets/Scenes/killcave/Lightmap-2_comp_dir.png index 23e2ea5..f8949f5 100644 Binary files a/Assets/Scenes/killcave/Lightmap-2_comp_dir.png and b/Assets/Scenes/killcave/Lightmap-2_comp_dir.png differ diff --git a/Assets/Scenes/killcave/Lightmap-2_comp_light.exr b/Assets/Scenes/killcave/Lightmap-2_comp_light.exr index 914f014..08efc94 100644 Binary files a/Assets/Scenes/killcave/Lightmap-2_comp_light.exr and b/Assets/Scenes/killcave/Lightmap-2_comp_light.exr differ diff --git a/Assets/Scenes/killcave/Lightmap-2_comp_shadowmask.png b/Assets/Scenes/killcave/Lightmap-2_comp_shadowmask.png index 11f2e11..1175e50 100644 Binary files a/Assets/Scenes/killcave/Lightmap-2_comp_shadowmask.png and b/Assets/Scenes/killcave/Lightmap-2_comp_shadowmask.png differ diff --git a/Assets/Scenes/killcave/Lightmap-3_comp_dir.png b/Assets/Scenes/killcave/Lightmap-3_comp_dir.png deleted file mode 100644 index 1bcfb01..0000000 Binary files a/Assets/Scenes/killcave/Lightmap-3_comp_dir.png and /dev/null differ diff --git a/Assets/Scenes/killcave/Lightmap-3_comp_dir.png.meta b/Assets/Scenes/killcave/Lightmap-3_comp_dir.png.meta deleted file mode 100644 index 1d2c684..0000000 --- a/Assets/Scenes/killcave/Lightmap-3_comp_dir.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: cfdd60656f2e9534c9de369acb4bb261 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - 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 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 12 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/killcave/Lightmap-3_comp_light.exr b/Assets/Scenes/killcave/Lightmap-3_comp_light.exr deleted file mode 100644 index 51a6de6..0000000 Binary files a/Assets/Scenes/killcave/Lightmap-3_comp_light.exr and /dev/null differ diff --git a/Assets/Scenes/killcave/Lightmap-3_comp_light.exr.meta b/Assets/Scenes/killcave/Lightmap-3_comp_light.exr.meta deleted file mode 100644 index f574b07..0000000 --- a/Assets/Scenes/killcave/Lightmap-3_comp_light.exr.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 053ea333b6d3ec04ba57c2dc9fa107ab -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 6 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/killcave/Lightmap-3_comp_shadowmask.png b/Assets/Scenes/killcave/Lightmap-3_comp_shadowmask.png deleted file mode 100644 index b5390a7..0000000 Binary files a/Assets/Scenes/killcave/Lightmap-3_comp_shadowmask.png and /dev/null differ diff --git a/Assets/Scenes/killcave/Lightmap-3_comp_shadowmask.png.meta b/Assets/Scenes/killcave/Lightmap-3_comp_shadowmask.png.meta deleted file mode 100644 index b8ebd2b..0000000 --- a/Assets/Scenes/killcave/Lightmap-3_comp_shadowmask.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: dbcaa2f1e0069c04495e112b189b275d -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - 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 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 11 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/killcave/ReflectionProbe-0.exr b/Assets/Scenes/killcave/ReflectionProbe-0.exr index 1b0c6f7..f287c20 100644 Binary files a/Assets/Scenes/killcave/ReflectionProbe-0.exr and b/Assets/Scenes/killcave/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/killcave/ReflectionProbe-1.exr b/Assets/Scenes/killcave/ReflectionProbe-1.exr index 0c6662e..516f8a2 100644 Binary files a/Assets/Scenes/killcave/ReflectionProbe-1.exr and b/Assets/Scenes/killcave/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/killcave/ReflectionProbe-2.exr b/Assets/Scenes/killcave/ReflectionProbe-2.exr index b49e049..f88eeb3 100644 Binary files a/Assets/Scenes/killcave/ReflectionProbe-2.exr and b/Assets/Scenes/killcave/ReflectionProbe-2.exr differ