diff --git a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat index aba74e733..c8724fb11 100644 --- a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat +++ b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat @@ -144,7 +144,7 @@ Material: - _DetailNormalMapScale: 1 - _DissolveNoiseScale: 251.9 - _DstBlend: 10 - - _EffectStrenght: 0.03 + - _EffectStrenght: 3.63 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 diff --git a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat index 35218cf18..778163da6 100644 --- a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat +++ b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat @@ -15,6 +15,7 @@ Material: m_ValidKeywords: - USEDISSOLVE_WITHOUT_ALPHA_CUTOUT - USEFRESNEL + - _ALPHATEST_ON - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: - _USEDISSOLVE_WITHOUT_ALPHA_CUTOUT @@ -123,7 +124,7 @@ Material: - USEFRESNEL: 1 - Vector1_473704f964214ae2bc68475022d1524b: 0.0131 - _AOStrength: 1.2 - - _AlphaClip: 0 + - _AlphaClip: 1 - _AlphaClipThreshold: 0.591 - _AlphaToMask: 0 - _BendEffect: 0 diff --git a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible.mat b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible.mat index 439769d01..a7f5890fb 100644 --- a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible.mat +++ b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible.mat @@ -13,6 +13,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - USEDISSOLVE_WITHOUT_ALPHA_CUTOUT - USEFRESNEL - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -62,6 +63,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Dissolve_6c880463713a41b3a5e9578c486d051d_NoiseMask_2224857806_Texture2D: + m_Texture: {fileID: 2800000, guid: 6cf5abd30715dea4aa1b2fcf187546a6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -135,6 +140,7 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 + - _DissolveNoiseScale: 25 - _DstBlend: 10 - _EffectThreshold: 0 - _EnvironmentReflections: 1 diff --git a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity index 13e4f498e..fa72ad294 100644 --- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity +++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity @@ -20472,12 +20472,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 55280052} serializedVersion: 2 - m_LocalRotation: {x: -0.11877847, y: 0.5749013, z: 0.103308015, w: 0.80293685} - m_LocalPosition: {x: 143.516, y: 29.46, z: -108.947} - m_LocalScale: {x: 1.5328181, y: 1.5328181, z: 1.5328181} + m_LocalRotation: {x: -0.010353333, y: 0.9688367, z: 0.15790682, w: 0.19056143} + m_LocalPosition: {x: -2.273204, y: 0.3021807, z: 0.65977824} + m_LocalScale: {x: 4.067156, y: 0.8578006, z: 1.3737559} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 315418252} m_LocalEulerAnglesHint: {x: -18.031, y: 70.925, z: 1.767} --- !u!1001 &55425622 PrefabInstance: @@ -26647,70 +26647,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} ---- !u!21 &83622785 -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!4 &83742598 stripped Transform: m_CorrespondingSourceObject: {fileID: 1059799105576019692, guid: 085ba9a312c11a942ab1bbbdd90f610e, @@ -29785,171 +29721,6 @@ Transform: m_Children: [] m_Father: {fileID: 1807495188} m_LocalEulerAnglesHint: {x: -0.241, y: 69.092, z: -0.938} ---- !u!43 &105290407 -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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - 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: 7.5, y: 7.5, 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!1001 &106381514 PrefabInstance: m_ObjectHideFlags: 0 @@ -78366,10 +78137,25 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 959742649} m_Modifications: + - target: {fileID: 198571548191673217, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 198571548191673217, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1803163625604236850, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1803163625604236850, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, type: 3} @@ -78446,24 +78232,81 @@ PrefabInstance: propertyPath: m_Name value: Rock_9 (19) objectReference: {fileID: 0} + - target: {fileID: 2959732555524133462, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 2959732555524133462, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3887208732131247640, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3887208732131247640, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7206562142631378845, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7314319379495946184, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 691e562c6a8fe7c4ebb8a82fd9a66463, type: 2} + - target: {fileID: 8836426341312251279, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_Convex + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, type: 3} insertIndex: 0 + addedObject: {fileID: 1372951240781402342} + - targetCorrespondingSourceObject: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + insertIndex: 1 + addedObject: {fileID: 55280055} + - targetCorrespondingSourceObject: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + insertIndex: 2 + addedObject: {fileID: 646504708} + - targetCorrespondingSourceObject: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + insertIndex: 3 addedObject: {fileID: 1660898370} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2959732555524133462, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + insertIndex: -1 + addedObject: {fileID: 773062388} + - targetCorrespondingSourceObject: {fileID: 2959732555524133462, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + insertIndex: -1 + addedObject: {fileID: 773062390} + - targetCorrespondingSourceObject: {fileID: 2959732555524133462, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + insertIndex: -1 + addedObject: {fileID: 773062389} + - targetCorrespondingSourceObject: {fileID: 2959732555524133462, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + insertIndex: -1 + addedObject: {fileID: 773062392} + - targetCorrespondingSourceObject: {fileID: 2959732555524133462, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + insertIndex: -1 + addedObject: {fileID: 773062393} m_SourcePrefab: {fileID: 100100000, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, type: 3} --- !u!1 &306262373 stripped GameObject: @@ -131743,171 +131586,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} ---- !u!43 &459142601 -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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - 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: 7.5, y: 7.5, 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!1001 &460195966 PrefabInstance: m_ObjectHideFlags: 0 @@ -177437,12 +177115,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 646504705} serializedVersion: 2 - m_LocalRotation: {x: 0.096484415, y: 0.6738102, z: -0.307828, w: 0.66476506} - m_LocalPosition: {x: 143.53, y: 29.32, z: -108.947} - m_LocalScale: {x: 1.5328181, y: 2.602725, z: 1.5328181} + m_LocalRotation: {x: -0.13629302, y: 0.9476303, z: -0.28811508, w: 0.020269483} + m_LocalPosition: {x: -2.2754624, y: 0.22693972, z: 0.6473453} + m_LocalScale: {x: 4.2047663, y: 1.6758338, z: 1.125463} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 315418252} m_LocalEulerAnglesHint: {x: 32.896, y: 84.989, z: -19.425} --- !u!4 &646578611 stripped Transform: @@ -181244,6 +180922,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7fb7821576a6b845a0679d59878aaf5, type: 3} +--- !u!21 &673439376 +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 &674482251 PrefabInstance: m_ObjectHideFlags: 0 @@ -205468,6 +205210,240 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3e135320742d14419cb4a6dadd5f86e, type: 3} +--- !u!1 &773062386 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2959732555524133462, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + m_PrefabInstance: {fileID: 305544235} + m_PrefabAsset: {fileID: 0} +--- !u!114 &773062388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773062386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 682758059d7c96744ac933502e52c610, type: 3} + m_Name: + m_EditorClassIdentifier: + m_meshesToDissolve: + - {fileID: 1660898372} + - {fileID: 9104041858939784668} + - {fileID: 55280053} + - {fileID: 646504706} + m_effect: {fileID: 0} + m_burnoutTime: 3 + m_destroyTime: 5 + m_delay: 1 + m_lightToAnimate: {fileID: 0} +--- !u!114 &773062389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773062386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd39910b59b4d8a48bebea6c7987c440, type: 3} + m_Name: + m_EditorClassIdentifier: + openCloseEvents: 0 + openCloseWindow: 0 + selectedToolbar: 0 + isInit: 0 + getHealthMethod: 0 + modifiers: + - name: Blast + filterMethod: 2 + damageTypes: + - Blast + value: -100 + percentage: 1 + destructible: 0 + resistance: 0 + maxResistance: 0 + onChangeResistance: + m_PersistentCalls: + m_Calls: [] + onBroken: + m_PersistentCalls: + m_Calls: [] + onAllModifiersIsBroken: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &773062390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773062386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f56a83ea88140fa4f869bb2f7ffdb184, type: 3} + m_Name: + m_EditorClassIdentifier: + openCloseEvents: 0 + openCloseWindow: 1 + selectedToolbar: 1 + _isDead: 0 + _currentHealth: 0 + isImmortal: 0 + fillHealthOnStart: 1 + maxHealth: 10 + healthRecovery: 0 + healthRecoveryDelay: 0 + currentHealthRecoveryDelay: 0 + checkHealthEvents: [] + _onStartReceiveDamage: + m_PersistentCalls: + m_Calls: [] + _onReceiveDamage: + m_PersistentCalls: + m_Calls: [] + _onDead: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 773062388} + m_TargetAssemblyTypeName: Beyond.CorpsBurnout, Assembly-CSharp + m_MethodName: StartBurnout + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onChangeHealth: + m_PersistentCalls: + m_Calls: [] + onResetHealth: + m_PersistentCalls: + m_Calls: [] +--- !u!82 &773062392 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773062386} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!64 &773062393 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773062386} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -2962914609976016690, guid: fd67f305d1276cb4baac14013b5c2d86, type: 3} --- !u!1001 &773982032 PrefabInstance: m_ObjectHideFlags: 0 @@ -359232,39 +359208,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1380873799} m_PrefabAsset: {fileID: 0} ---- !u!21 &1381021968 -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 &1381553017 PrefabInstance: m_ObjectHideFlags: 0 @@ -449420,8 +449363,7 @@ GameObject: - component: {fileID: 1660898370} - component: {fileID: 1660898373} - component: {fileID: 1660898372} - - component: {fileID: 1660898371} - m_Layer: 0 + m_Layer: 9 m_Name: Rock_9_LOD0 (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -449443,28 +449385,6 @@ Transform: m_Children: [] m_Father: {fileID: 315418252} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &1660898371 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1660898369} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -2962914609976016690, guid: fd67f305d1276cb4baac14013b5c2d86, type: 3} --- !u!23 &1660898372 MeshRenderer: m_ObjectHideFlags: 0 @@ -458635,6 +458555,39 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5f757d9f8ec3fd847b9425282b71d2a9, type: 3} +--- !u!21 &1674336503 +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!1 &1674667343 GameObject: m_ObjectHideFlags: 0 @@ -460324,6 +460277,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3172182016931273940, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: damage.damageType + value: Blast + objectReference: {fileID: 0} - target: {fileID: 3244563195940327563, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: 'imagesToPulse.Array.data[1]' @@ -461132,7 +461090,7 @@ PrefabInstance: - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: startItems.Array.size - value: 14 + value: 15 objectReference: {fileID: 0} - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -461202,7 +461160,7 @@ PrefabInstance: - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: startItems.Array.data[14].id - value: 1 + value: 22 objectReference: {fileID: 0} - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -461472,12 +461430,12 @@ PrefabInstance: - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: startItems.Array.data[14].autoEquip - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: startItems.Array.data[14].indexArea - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -484390,6 +484348,74 @@ MonoBehaviour: useVisualEffects: 1 useParticleSystems: 1 useAudioSources: 0 +--- !u!1001 &1794824499 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3638340101395894425, guid: 893c4bb8a0b55425ea8be1b55ec567fd, + type: 3} + propertyPath: m_Name + value: Barrel_destruction_CUT Variant + objectReference: {fileID: 0} + - target: {fileID: 4122530506127608355, guid: 893c4bb8a0b55425ea8be1b55ec567fd, + type: 3} + propertyPath: m_LocalPosition.x + value: 200.066 + objectReference: {fileID: 0} + - target: {fileID: 4122530506127608355, guid: 893c4bb8a0b55425ea8be1b55ec567fd, + type: 3} + propertyPath: m_LocalPosition.y + value: 29.166 + objectReference: {fileID: 0} + - target: {fileID: 4122530506127608355, guid: 893c4bb8a0b55425ea8be1b55ec567fd, + type: 3} + propertyPath: m_LocalPosition.z + value: -110.005 + objectReference: {fileID: 0} + - target: {fileID: 4122530506127608355, guid: 893c4bb8a0b55425ea8be1b55ec567fd, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4122530506127608355, guid: 893c4bb8a0b55425ea8be1b55ec567fd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4122530506127608355, guid: 893c4bb8a0b55425ea8be1b55ec567fd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4122530506127608355, guid: 893c4bb8a0b55425ea8be1b55ec567fd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4122530506127608355, guid: 893c4bb8a0b55425ea8be1b55ec567fd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4122530506127608355, guid: 893c4bb8a0b55425ea8be1b55ec567fd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4122530506127608355, guid: 893c4bb8a0b55425ea8be1b55ec567fd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 893c4bb8a0b55425ea8be1b55ec567fd, type: 3} --- !u!1001 &1795689366 PrefabInstance: m_ObjectHideFlags: 0 @@ -541784,6 +541810,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a9dae1a0512df8f4996c103cd325f56f, type: 3} +--- !u!43 &1988322218 +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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + 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: 7.5, y: 7.5, 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!1001 &1989866158 PrefabInstance: m_ObjectHideFlags: 0 @@ -544415,6 +544606,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 942796803} m_PrefabAsset: {fileID: 0} +--- !u!43 &2000739371 +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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + 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: 7.5, y: 7.5, 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!1001 &2001299309 PrefabInstance: m_ObjectHideFlags: 0 @@ -630351,12 +630707,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4295235365257824730} serializedVersion: 2 - m_LocalRotation: {x: -0.09064092, y: 0.1952994, z: 0.058596637, w: 0.9747865} - m_LocalPosition: {x: 147.008, y: 29.12679, z: -109.318} - m_LocalScale: {x: 1.5328181, y: 1.5328181, z: 1.5328181} + m_LocalRotation: {x: -0.02046233, y: 0.8107265, z: 0.103823185, w: 0.5757817} + m_LocalPosition: {x: -2.9609303, y: 0.13243124, z: -2.328355} + m_LocalScale: {x: 1.4264857, y: 0.847888, z: 3.8587546} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 315418252} m_LocalEulerAnglesHint: {x: -11.514, y: 22.193, z: 4.615} --- !u!1 &1395690397798409377 GameObject: @@ -633810,7 +634166,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1381021968} + - {fileID: 1674336503} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -633903,7 +634259,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 83622785} + overrideMaterial: {fileID: 673439376} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 @@ -682312,9 +682668,6 @@ SceneRoots: - {fileID: 464238094} - {fileID: 1210456151} - {fileID: 1537884500} - - {fileID: 1372951240781402342} - - {fileID: 55280055} - - {fileID: 646504708} - {fileID: 778396694} - {fileID: 1995318090} - {fileID: 2139104646} @@ -682340,3 +682693,4 @@ SceneRoots: - {fileID: 1373167343} - {fileID: 18198455} - {fileID: 2062553764} + - {fileID: 1794824499} diff --git a/Assets/Shaders/InvisibleMat.mat b/Assets/Shaders/InvisibleMat.mat index c97c89161..11151ceef 100644 --- a/Assets/Shaders/InvisibleMat.mat +++ b/Assets/Shaders/InvisibleMat.mat @@ -13,10 +13,11 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - USEDISSOLVE_WITHOUT_ALPHA_CUTOUT - USEFRESNEL - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: - _USEDISSOLVE_WITHOUT_ALPHA_CUTOUT - m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -51,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Dissolve_6c880463713a41b3a5e9578c486d051d_NoiseMask_2224857806_Texture2D: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 6cf5abd30715dea4aa1b2fcf187546a6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: @@ -96,6 +97,8 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - USEDISSOLVE: 1 + - USEDISSOLVEMASK: 0 - USEFRESNEL: 1 - Vector1_473704f964214ae2bc68475022d1524b: 0.05 - _AOStrength: 1