diff --git a/Assets/Meshes/Terrain/Terrain_Land01_village.asset b/Assets/Meshes/Terrain/Terrain_Land01_village.asset index ea800d37d..d4055d10a 100644 Binary files a/Assets/Meshes/Terrain/Terrain_Land01_village.asset and b/Assets/Meshes/Terrain/Terrain_Land01_village.asset differ diff --git a/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity index 5870e3377..6d55a29a7 100644 --- a/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity +++ b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity @@ -62888,6 +62888,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} +--- !u!43 &478587969 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &479263182 GameObject: m_ObjectHideFlags: 0 @@ -87538,70 +87703,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 602633919} m_PrefabAsset: {fileID: 0} ---- !u!21 &602642184 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _DIRECTIONALL: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _DirectionalMode: 1 - - _FOGG: 1 - - _FogAxisMode: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 200 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: -200 - - _FogHeightEnd: 200 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _NOISEE: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMode: 2 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SKYBOXX: 1 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _TITLE: 1 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &602741162 PrefabInstance: m_ObjectHideFlags: 0 @@ -115385,6 +115486,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 761322311} m_PrefabAsset: {fileID: 0} +--- !u!21 &761400593 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Height Fog Global + m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3002 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _TITLE: 1 + - _TransparentQueue: 3000 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1001 &761727940 PrefabInstance: m_ObjectHideFlags: 0 @@ -115663,67 +115797,67 @@ PrefabInstance: - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalScale.x - value: 0.34963945 + value: 0.4083439 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalScale.y - value: 0.23512198 + value: 0.32106107 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalScale.z - value: 0.34963956 + value: 0.40834403 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalPosition.x - value: -4.931 + value: -3.753 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalPosition.y - value: 40.761 + value: 40.893 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalPosition.z - value: -38.92 + value: -38.655 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalRotation.w - value: -0.12359462 + value: -0.11944268 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalRotation.x - value: -0.0027202943 + value: -0.103202425 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalRotation.y - value: -0.98890144 + value: -0.98698324 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalRotation.z - value: -0.08240717 + value: -0.030771386 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -9.341 + value: -2.068 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -194.37 + value: -194.021 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 1.495 + value: 12.193 objectReference: {fileID: 0} - target: {fileID: 2024919131226784534, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} @@ -138509,17 +138643,17 @@ PrefabInstance: - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalScale.x - value: 0.48734996 + value: 0.9987671 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalScale.y - value: 0.48734993 + value: 0.998767 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalScale.z - value: 0.58296806 + value: 1.1947253 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} @@ -138539,37 +138673,37 @@ PrefabInstance: - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7976689 + value: 0.80350155 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalRotation.x - value: 0.13620801 + value: 0.09245573 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalRotation.y - value: -0.5833031 + value: -0.5802308 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalRotation.z - value: -0.07020907 + value: -0.09575793 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 7.781 + value: 2.146 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -73.439 + value: -71.954 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -15.868 + value: -15.151 objectReference: {fileID: 0} - target: {fileID: 5820509807421930497, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} @@ -146279,42 +146413,42 @@ PrefabInstance: - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -135 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210.00003 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 763034042805173548, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -147130,22 +147264,22 @@ PrefabInstance: - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -225 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4310148345887150382, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -147250,22 +147384,22 @@ PrefabInstance: - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -315 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4907318199456855652, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -148545,22 +148679,22 @@ PrefabInstance: - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7534046934194550914, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -158191,92 +158325,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1063070549} m_PrefabAsset: {fileID: 0} ---- !u!1 &1094494949 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1094494950} - - component: {fileID: 1094494952} - - component: {fileID: 1094494951} - m_Layer: 0 - m_Name: Wood_018_LOD0 (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1094494950 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1094494949} - serializedVersion: 2 - m_LocalRotation: {x: -0.7957735, y: 0.042785645, z: 0.00890716, w: 0.60401535} - m_LocalPosition: {x: -0.018, y: 0.286, z: 0.009} - m_LocalScale: {x: 0.44793642, y: 1.4557709, z: 0.214351} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 472218933} - m_LocalEulerAnglesHint: {x: -74.171, y: 172.096, z: -167.866} ---- !u!23 &1094494951 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1094494949} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 09cdabf4afdd66545a9cec40d5bdc6f7, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1094494952 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1094494949} - m_Mesh: {fileID: -409176766074220570, guid: 5721781e2a2b4c048955aab1a5ca5351, type: 3} --- !u!1001 &1094874189 PrefabInstance: m_ObjectHideFlags: 0 @@ -174914,17 +174962,17 @@ PrefabInstance: - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalScale.x - value: 0.47482836 + value: 0.71827286 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalScale.y - value: 0.31930768 + value: 0.48301673 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} propertyPath: m_LocalScale.z - value: 0.47482836 + value: 0.71827286 objectReference: {fileID: 0} - target: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} @@ -178119,10 +178167,6 @@ PrefabInstance: type: 3} insertIndex: 3 addedObject: {fileID: 1992788757} - - targetCorrespondingSourceObject: {fileID: 4491298821001776300, guid: 881f31c74a267d64d808796300480d2e, - type: 3} - insertIndex: 4 - addedObject: {fileID: 1094494950} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 881f31c74a267d64d808796300480d2e, type: 3} --- !u!1 &1248533528 @@ -207577,6 +207621,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 249f153543576874e84df57b8bb314cd, type: 3} +--- !u!21 &1500119844 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Override + m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _DIRECTIONALL: 1 + - _DirectionalFalloff: 2 + - _DirectionalIntensity: 1 + - _DirectionalMode: 1 + - _FOGG: 1 + - _FogAxisMode: 1 + - _FogColorDuo: 1 + - _FogDistanceEnd: 200 + - _FogDistanceFalloff: 2 + - _FogDistanceStart: -200 + - _FogHeightEnd: 200 + - _FogHeightFalloff: 2 + - _FogHeightStart: 0 + - _FogIntensity: 1 + - _FogLayersMode: 0 + - _IsHeightFogPreset: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _NOISEE: 1 + - _NoiseDistanceEnd: 50 + - _NoiseIntensity: 1 + - _NoiseMode: 2 + - _NoiseModeBlend: 1 + - _NoiseScale: 30 + - _SKYBOXX: 1 + - _SkyboxFogFalloff: 1 + - _SkyboxFogFill: 1 + - _SkyboxFogHeight: 1 + - _SkyboxFogIntensity: 1 + - _TITLE: 1 + m_Colors: + - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} + - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} + - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} + - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} + - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} + - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1001 &1500122287 PrefabInstance: m_ObjectHideFlags: 0 @@ -214499,6 +214607,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bb960ae7d1ef7434183b6c2bfa86a877, type: 3} +--- !u!43 &1568459654 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1570117029 PrefabInstance: m_ObjectHideFlags: 0 @@ -229362,6 +229635,145 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1672118744} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1672981007 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1911060230} + m_Modifications: + - target: {fileID: 1620150190763413640, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.17939006 + objectReference: {fileID: 0} + - target: {fileID: 1620150190763413640, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.36599988 + objectReference: {fileID: 0} + - target: {fileID: 1620150190763413640, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.009663018 + objectReference: {fileID: 0} + - target: {fileID: 1620150190763413640, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9247348 + objectReference: {fileID: 0} + - target: {fileID: 1620150190763413640, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.35486138 + objectReference: {fileID: 0} + - target: {fileID: 1620150190763413640, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.033445638 + objectReference: {fileID: 0} + - target: {fileID: 1620150190763413640, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.1334931 + objectReference: {fileID: 0} + - target: {fileID: 1620150190763413640, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 41.7 + objectReference: {fileID: 0} + - target: {fileID: 1620150190763413640, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 2.524 + objectReference: {fileID: 0} + - target: {fileID: 1620150190763413640, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 17.39 + objectReference: {fileID: 0} + - target: {fileID: 1708752897604959647, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_Name + value: Old_treeA (1) + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalScale.x + value: 2.1190202 + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalScale.y + value: 2.1190202 + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalScale.z + value: 2.1190202 + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalPosition.x + value: -10.272 + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalPosition.y + value: 42.007 + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalPosition.z + value: -52.76 + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.6212536 + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.006534895 + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.08419158 + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.77904624 + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 8.007 + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 5.472 + objectReference: {fileID: 0} + - target: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -102.475 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 46e6911bcd226d64eb62ffc06ef376f4, type: 3} +--- !u!4 &1672981008 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2088936957602817829, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + m_PrefabInstance: {fileID: 1672981007} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1673871665 PrefabInstance: m_ObjectHideFlags: 0 @@ -314351,6 +314763,10 @@ PrefabInstance: type: 3} insertIndex: 53 addedObject: {fileID: 2115353380} + - targetCorrespondingSourceObject: {fileID: 6208423724741352500, guid: 30d3c74e8577e4949aeaaf2ac2ceb479, + type: 3} + insertIndex: 65 + addedObject: {fileID: 1672981008} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 30d3c74e8577e4949aeaaf2ac2ceb479, type: 3} --- !u!4 &1911060230 stripped @@ -325910,7 +326326,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0.26985097, y: 0.5858753, z: 0.34840178, w: 0.68010795} m_LocalPosition: {x: -1.009, y: -0.6, z: 0.707} - m_LocalScale: {x: 0.867182, y: 1.0261881, z: 0.4149725} + m_LocalScale: {x: 1.0358489, y: 1.2257817, z: 0.49568465} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 472218933} @@ -345662,39 +346078,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2099861972} m_PrefabAsset: {fileID: 0} ---- !u!21 &2099930308 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &2100590589 PrefabInstance: m_ObjectHideFlags: 0 @@ -419601,7 +419984,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2099930308} + - {fileID: 761400593} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -419694,7 +420077,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 602642184} + overrideMaterial: {fileID: 1500119844} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180