diff --git a/Assets/Meshes/Characters/Giant/Materials_Giant/B_skin Giant.mat b/Assets/Meshes/Characters/Giant/Materials_Giant/B_skin Giant.mat index 9b231b059..a5a792bd5 100644 --- a/Assets/Meshes/Characters/Giant/Materials_Giant/B_skin Giant.mat +++ b/Assets/Meshes/Characters/Giant/Materials_Giant/B_skin Giant.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: B_skin Giant m_Shader: {fileID: 4800000, guid: 1fa26dd10b8b24b3baa6b8731ec2176b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BACKSCATTER - _DISTANCEFADE @@ -37,6 +39,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -124,7 +127,7 @@ Material: - _Shadows: 0 - _SkinShadowBias: 0.149 - _SkinShadowSamplingBias: 0.0108 - - _Smoothness: 0.381 + - _Smoothness: 0.78 - _SmoothnessTextureChannel: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -143,7 +146,7 @@ Material: - _WriteMask: 255 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.6509434, g: 0.6509434, b: 0.6509434, a: 1} + - _BaseColor: {r: 0.9622642, g: 0.9622642, b: 0.9622642, a: 1} - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _DistanceFade: {r: 398.00253, g: 0.01, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} @@ -153,3 +156,4 @@ Material: - _SubsurfaceColor: {r: 0.8962264, g: 0.67499655, b: 0.6468049, a: 1} - _WindMultiplier: {r: 1, g: 2, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Meshes/Characters/Giant/Materials_Giant/Giant_Armor.mat b/Assets/Meshes/Characters/Giant/Materials_Giant/Giant_Armor.mat index cf07deff2..163be0443 100644 --- a/Assets/Meshes/Characters/Giant/Materials_Giant/Giant_Armor.mat +++ b/Assets/Meshes/Characters/Giant/Materials_Giant/Giant_Armor.mat @@ -12,9 +12,9 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _METALLICSPECGLOSSMAP - _NORMALMAP - _OCCLUSIONMAP + - _SPECULAR_SETUP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -109,19 +109,19 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 1 + - _Smoothness: 0.56 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 - - _WorkflowMode: 1 + - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _SpecColor: {r: 0.028301895, g: 0.028301895, b: 0.028301895, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 --- !u!114 &3563984986921131127 diff --git a/Assets/Meshes/Characters/Giant/Materials_Giant/Giant_Hair.mat b/Assets/Meshes/Characters/Giant/Materials_Giant/Giant_Hair.mat index 07d0e44a7..d2ea57ef0 100644 --- a/Assets/Meshes/Characters/Giant/Materials_Giant/Giant_Hair.mat +++ b/Assets/Meshes/Characters/Giant/Materials_Giant/Giant_Hair.mat @@ -107,7 +107,7 @@ Material: - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - - _Cutoff: 0.064 + - _Cutoff: 0.54 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -121,7 +121,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.167 + - _Smoothness: 0.26 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -130,8 +130,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.2924528, g: 0.2924528, b: 0.2924528, a: 1} - - _Color: {r: 0.29245278, g: 0.29245278, b: 0.29245278, a: 1} + - _BaseColor: {r: 0.7735849, g: 0.7735849, b: 0.7735849, a: 1} + - _Color: {r: 0.7735849, g: 0.7735849, b: 0.7735849, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/01_Wasteland/Wasteland_Arenas.unity b/Assets/Scenes/01_Wasteland/Wasteland_Arenas.unity index 330bdcb7b..a523e5cdf 100644 --- a/Assets/Scenes/01_Wasteland/Wasteland_Arenas.unity +++ b/Assets/Scenes/01_Wasteland/Wasteland_Arenas.unity @@ -11006,6 +11006,39 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1033040880} m_SourcePrefab: {fileID: 100100000, guid: c25cd2eb3b4754a4a8a501237afa65b0, type: 3} +--- !u!21 &29061839 +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 &29242679 PrefabInstance: m_ObjectHideFlags: 0 @@ -102299,6 +102332,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 391370989} m_PrefabAsset: {fileID: 0} +--- !u!43 &391494200 +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!1 &391629670 GameObject: m_ObjectHideFlags: 0 @@ -134573,171 +134771,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 191784669} m_PrefabAsset: {fileID: 0} ---- !u!43 &470605920 -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!4 &470629885 stripped Transform: m_CorrespondingSourceObject: {fileID: 6834609825192720160, guid: d419e125d0071454c82743d15356b5f1, @@ -152664,6 +152697,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1a421c49d039900488d31bef360a485d, type: 3} +--- !u!43 &521462329 +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!4 &521576154 stripped Transform: m_CorrespondingSourceObject: {fileID: 8166295448093787280, guid: e115436bfe06bd447a266ca75621bbdd, @@ -193437,52 +193635,52 @@ PrefabInstance: - target: {fileID: 4243526660898709615, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.x - value: -9.95 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4243526660898709615, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.y - value: 1.22 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4243526660898709615, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.z - value: -15.4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4243526660898709615, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.w - value: 0.93872976 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4243526660898709615, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.x - value: 0.03161129 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4243526660898709615, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.y - value: 0.30780682 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4243526660898709615, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.z - value: -0.1517968 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4243526660898709615, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 8.789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4243526660898709615, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 35.103 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4243526660898709615, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -15.586 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} @@ -193507,7 +193705,7 @@ PrefabInstance: - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.x - value: 32.683 + value: 30.59 objectReference: {fileID: 0} - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} @@ -193517,7 +193715,7 @@ PrefabInstance: - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.z - value: -107.987 + value: -98.1 objectReference: {fileID: 0} - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} @@ -193582,52 +193780,52 @@ PrefabInstance: - target: {fileID: 8380743374656169182, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.x - value: -6.81 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8380743374656169182, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.y - value: -0.2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8380743374656169182, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.z - value: -28.89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8380743374656169182, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.w - value: 0.93872976 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8380743374656169182, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.x - value: 0.03161129 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8380743374656169182, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.y - value: 0.30780682 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8380743374656169182, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.z - value: -0.1517968 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8380743374656169182, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 8.789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8380743374656169182, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 35.103 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8380743374656169182, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -15.586 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8447269108096540267, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} @@ -193647,52 +193845,52 @@ PrefabInstance: - target: {fileID: 8447269108096540267, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.x - value: -9.95 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8447269108096540267, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.y - value: 1.22 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8447269108096540267, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.z - value: -15.4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8447269108096540267, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.w - value: 0.93872976 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8447269108096540267, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.x - value: 0.03161129 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8447269108096540267, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.y - value: 0.30780682 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8447269108096540267, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.z - value: -0.1517968 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8447269108096540267, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 8.789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8447269108096540267, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 35.103 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8447269108096540267, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -15.586 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -221318,70 +221516,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 809749963} m_PrefabAsset: {fileID: 0} ---- !u!21 &811204971 -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!1 &811773438 GameObject: m_ObjectHideFlags: 0 @@ -273380,9 +273514,7 @@ MonoBehaviour: m_sunLight: {fileID: 205662652} m_moonLight: {fileID: 0} WeatherPresent: 0 - WeatherSystem: {fileID: 0} m_sunLightExists: 1 - m_moonLightExists: 0 --- !u!4 &1013064392 Transform: m_ObjectHideFlags: 10 @@ -285951,6 +286083,70 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 724e798a22aebea45a44f42d9136c16d, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &1061166585 +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 &1061400880 PrefabInstance: m_ObjectHideFlags: 0 @@ -289212,171 +289408,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1072907707} m_PrefabAsset: {fileID: 0} ---- !u!43 &1074503085 -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!4 &1074943383 stripped Transform: m_CorrespondingSourceObject: {fileID: 3056393058199397780, guid: 003daaab58a32ca419f0a3ef3dbef864, @@ -458200,12 +458231,12 @@ PrefabInstance: - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 25555778 + value: 26487238 objectReference: {fileID: 0} - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -4088907.8 + value: -4237933.5 objectReference: {fileID: 0} - target: {fileID: 5274644603648758540, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -460242,8 +460273,6 @@ MonoBehaviour: x: 250 y: 250 z: 250 - m_allFloatingPointFixMembers: [] - m_allWorldSpaceParticleSystems: [] m_originTargetTileX: 0 m_originTargetTileZ: 0 m_terrainUnloadMemoryTreshold: 4294967296 @@ -488403,39 +488432,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 003daaab58a32ca419f0a3ef3dbef864, type: 3} ---- !u!21 &1796740544 -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 &1797255213 PrefabInstance: m_ObjectHideFlags: 0 @@ -676820,7 +676816,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1796740544} + - {fileID: 29061839} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -676913,7 +676909,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 811204971} + overrideMaterial: {fileID: 1061166585} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180