diff --git a/Assets/Animations/GATE_SIGNTimeline.playable b/Assets/Animations/GATE_SIGNTimeline.playable index b0d7fad49..bc7f77d24 100644 --- a/Assets/Animations/GATE_SIGNTimeline.playable +++ b/Assets/Animations/GATE_SIGNTimeline.playable @@ -1045,7 +1045,7 @@ MonoBehaviour: - {fileID: -8164423619563886998} - {fileID: 7470072581375809379} - {fileID: 7889838710016750406} - m_FixedDuration: 18.916666666666668 + m_FixedDuration: 19.05 m_EditorSettings: m_Framerate: 60 m_ScenePreview: 1 diff --git a/Assets/Meshes/Enviroment/Nature/Rocks/Ground_holes/Ground_holes_mat.mat b/Assets/Meshes/Enviroment/Nature/Rocks/Ground_holes/Ground_holes_mat.mat index 3048e149f..b7f402032 100644 --- a/Assets/Meshes/Enviroment/Nature/Rocks/Ground_holes/Ground_holes_mat.mat +++ b/Assets/Meshes/Enviroment/Nature/Rocks/Ground_holes/Ground_holes_mat.mat @@ -163,7 +163,7 @@ Material: - BaseColor: {r: 1, g: 1, b: 1, a: 0} - Color_613d1588816440ec9b17710effb7528b: {r: 0, g: 13.98681, b: 714.8679, a: 0} - EmissiveColor: {r: 0, g: 0, b: 0, a: 0} - - _BaseColor: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} + - _BaseColor: {r: 0.9622642, g: 0.9622642, b: 0.9622642, a: 1} - _BendVector: {r: 0, g: -1, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Meshes/Terrain/Terrain_Land01.asset b/Assets/Meshes/Terrain/Terrain_Land01.asset index 68297a893..bf6f68a2d 100644 Binary files a/Assets/Meshes/Terrain/Terrain_Land01.asset and b/Assets/Meshes/Terrain/Terrain_Land01.asset differ diff --git a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity index 2131b0170..124a5791a 100644 --- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity +++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity @@ -4456,6 +4456,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 8 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -11754,171 +11755,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1909627574} m_PrefabAsset: {fileID: 0} ---- !u!43 &43187640 -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 &43350459 PrefabInstance: m_ObjectHideFlags: 0 @@ -25208,6 +25044,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -28573,6 +28410,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 64 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -34568,6 +34406,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 8 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -35958,6 +35797,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 8 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -37405,6 +37245,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 64 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -59812,6 +59653,99 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} +--- !u!1001 &305544235 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 959742649} + m_Modifications: + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_RootOrder + value: 114 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalScale.x + value: 0.72723025 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalScale.y + value: 1.8598394 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalScale.z + value: 1.1743802 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalPosition.x + value: 145.923 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalPosition.y + value: 28.9 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalPosition.z + value: -106.481 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.6641211 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.060536373 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7418573 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.07018759 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -1.36 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 96.204 + objectReference: {fileID: 0} + - target: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 10.55 + objectReference: {fileID: 0} + - target: {fileID: 2959732555524133462, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_Name + value: Rock_9 (19) + objectReference: {fileID: 0} + - target: {fileID: 2959732555524133462, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, type: 3} --- !u!1 &306262373 stripped GameObject: m_CorrespondingSourceObject: {fileID: 54019902296789349, guid: debae7db8fff99e4e95805df5a7738af, @@ -60874,6 +60808,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1847500192} m_PrefabAsset: {fileID: 0} +--- !u!4 &315418252 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, + type: 3} + m_PrefabInstance: {fileID: 305544235} + m_PrefabAsset: {fileID: 0} --- !u!1001 &315432909 PrefabInstance: m_ObjectHideFlags: 0 @@ -93339,17 +93279,17 @@ PrefabInstance: - target: {fileID: 1311000758874380743, guid: b3e135320742d14419cb4a6dadd5f86e, type: 3} propertyPath: m_LocalPosition.x - value: 53.33 + value: 53.889 objectReference: {fileID: 0} - target: {fileID: 1311000758874380743, guid: b3e135320742d14419cb4a6dadd5f86e, type: 3} propertyPath: m_LocalPosition.y - value: 31.1 + value: 31.345 objectReference: {fileID: 0} - target: {fileID: 1311000758874380743, guid: b3e135320742d14419cb4a6dadd5f86e, type: 3} propertyPath: m_LocalPosition.z - value: -175.02 + value: -173.331 objectReference: {fileID: 0} - target: {fileID: 1311000758874380743, guid: b3e135320742d14419cb4a6dadd5f86e, type: 3} @@ -99288,6 +99228,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 64 + fireOnce: 1 condition: luaConditions: [] questConditions: @@ -106338,70 +106279,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1866894748} m_PrefabAsset: {fileID: 0} ---- !u!21 &567234661 -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 &567479769 PrefabInstance: m_ObjectHideFlags: 0 @@ -118119,6 +117996,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 286837719} m_PrefabAsset: {fileID: 0} +--- !u!43 &634768846 +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 &636121997 GameObject: m_ObjectHideFlags: 0 @@ -123228,6 +123270,39 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 669945271} m_CullTransparentMesh: 1 +--- !u!21 &670287241 +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 &671871174 GameObject: m_ObjectHideFlags: 0 @@ -131439,6 +131514,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 64 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -143166,6 +143242,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 8 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -144748,6 +144825,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 64 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -182818,6 +182896,7 @@ Transform: - {fileID: 509498440} - {fileID: 728398033} - {fileID: 123190321} + - {fileID: 315418252} - {fileID: 1776244201} - {fileID: 2111138819} - {fileID: 491773230} @@ -183958,39 +184037,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 966243548} m_PrefabAsset: {fileID: 0} ---- !u!21 &966357247 -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 &967146699 GameObject: m_ObjectHideFlags: 0 @@ -203043,6 +203089,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -203760,6 +203807,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -210532,6 +210580,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 8 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -213793,6 +213842,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -216564,6 +216614,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 8192 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -218258,6 +218309,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -219165,6 +219217,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 64 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -223073,6 +223126,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 8 + fireOnce: 1 condition: luaConditions: [] questConditions: @@ -226284,6 +226338,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 8192 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -233297,6 +233352,70 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2040949541} m_PrefabAsset: {fileID: 0} +--- !u!21 &1254208807 +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 &1254341466 PrefabInstance: m_ObjectHideFlags: 0 @@ -246718,6 +246837,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 + fireOnce: 1 condition: luaConditions: [] questConditions: @@ -251005,6 +251125,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1787902494} m_PrefabAsset: {fileID: 0} +--- !u!43 &1362906061 +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 &1362974215 GameObject: m_ObjectHideFlags: 0 @@ -263289,6 +263574,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 64 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -275946,6 +276232,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -281454,6 +281741,11 @@ PrefabInstance: propertyPath: InitialModule.maxNumParticles value: 200 objectReference: {fileID: 0} + - target: {fileID: 927769488672062256, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, + type: 3} + propertyPath: InitialModule.startColor.maxColor.a + value: 0.7607843 + objectReference: {fileID: 0} - target: {fileID: 927769488672062256, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: InitialModule.startColor.maxColor.b @@ -281512,7 +281804,7 @@ PrefabInstance: - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_LocalPosition.y - value: 31.268 + value: 32.106 objectReference: {fileID: 0} - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} @@ -290699,6 +290991,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 8 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -323952,6 +324245,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -337986,6 +338280,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -340081,6 +340376,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 64 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -358411,6 +358707,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -360078,6 +360375,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 64 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -366881,6 +367179,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 64 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -367365,6 +367664,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 64 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -371721,6 +372021,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 64 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -379126,171 +379427,6 @@ Transform: m_Children: [] m_Father: {fileID: 947839024} m_LocalEulerAnglesHint: {x: -2.749, y: 22.039, z: -66.091} ---- !u!43 &2058453019 -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 &2060065818 stripped Transform: m_CorrespondingSourceObject: {fileID: 8796324461493406308, guid: 2093405148016dc4f84c8b2ac3949a7a, @@ -380823,6 +380959,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 8 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -390347,6 +390484,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 8 + fireOnce: 1 condition: luaConditions: [] questConditions: [] diff --git a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat index fd9bcbb81..3375fde88 100644 --- a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat +++ b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat @@ -65,11 +65,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _BlendOp: 2 + - _BlendOp: 0 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 diff --git a/Assets/ThirdParty/PARTICLES/KriptoFX/MeshEffect/Materials/Effect2/Smoke.mat b/Assets/ThirdParty/PARTICLES/KriptoFX/MeshEffect/Materials/Effect2/Smoke.mat index 5d97638d2..c1810cec6 100644 --- a/Assets/ThirdParty/PARTICLES/KriptoFX/MeshEffect/Materials/Effect2/Smoke.mat +++ b/Assets/ThirdParty/PARTICLES/KriptoFX/MeshEffect/Materials/Effect2/Smoke.mat @@ -2,21 +2,33 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Smoke m_Shader: {fileID: 4800000, guid: 3bc67cd3532d0b2429f1a3eddf7f22f7, type: 3} - m_ShaderKeywords: BlendAdd Clip_OFF FrameBlend_ON FresnelFade_OFF SoftParticles_ON - VertLight_OFF _BLENDMODE_ADD _FADING_ON _FLIPBOOK_BLENDING + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _FADING_ON + - _FLIPBOOK_BLENDING + m_InvalidKeywords: + - BlendAdd + - Clip_OFF + - FrameBlend_ON + - FresnelFade_OFF + - SoftParticles_ON + - VertLight_OFF + - _BLENDMODE_ADD m_LightmapFlags: 5 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -102,6 +114,7 @@ Material: - _UseParticlesAlphaCutout: 0 - _UseSoft: 1 - _UseSoftCutout: 0 + - _UseVertexLight: 0 - _UseVertexStreamRandom: 0 - _ZWrite: 1 - _ZWriteMode: 0 @@ -115,3 +128,4 @@ Material: - _Tiling: {r: 800, g: 800, b: 8, a: 8} - _TintColor: {r: 1, g: 0.18620686, b: 0, a: 0.1} m_BuildTextureStacks: [] + m_AllowLocking: 1