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 5db73b9d0..90c01dc1e 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 @@ -13,11 +13,13 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - USEDISSOLVE_WITHOUT_ALPHA_CUTOUT + - USEDISSOLVE_WITH_ALPHA_CUTOUT - USEFRESNEL - _ALPHATEST_ON - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: + - _RECEIVE_SHADOWS_OFF + - _SPECULAR_SETUP - _USEDISSOLVE_WITHOUT_ALPHA_CUTOUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -33,7 +35,7 @@ Material: serializedVersion: 3 m_TexEnvs: - BaseTex: - m_Texture: {fileID: 2800000, guid: 55d97f02382f8664a948d4481e42ecc2, type: 3} + m_Texture: {fileID: 2800000, guid: 5c9ed9864385d8449b9f9528d61e1645, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - DissolveMask: @@ -119,10 +121,10 @@ Material: - Metalness: 0.26 - NormalStrength: 1.47 - Smoothness: 0.19 - - USEDISSOLVE: 1 + - USEDISSOLVE: 2 - USEDISSOLVEMASK: 0 - USEFRESNEL: 1 - - Vector1_473704f964214ae2bc68475022d1524b: 0.088 + - Vector1_473704f964214ae2bc68475022d1524b: 0.0432 - _AOStrength: 1.1 - _AlphaClip: 1 - _AlphaClipThreshold: 0.51 @@ -156,13 +158,13 @@ Material: - _InverseFadeRange: 1 - _InverseFarFadeRange: 0.5 - _Metallic: 0 - - _NormalStrength: 2.04 + - _NormalStrength: 0.545 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueControl: 0 - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 2.44 + - _ReceiveShadows: 0 + - _Smoothness: 2.27 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 @@ -173,7 +175,7 @@ Material: - _USEDISTANCEFADE: 0 - _USESCANWAVE: 0 - _WaveTrail: 4 - - _WorkflowMode: 1 + - _WorkflowMode: 0 - _ZTest: 4 - _ZWrite: 1 - _ZWriteControl: 1 @@ -183,12 +185,12 @@ Material: - Color_613d1588816440ec9b17710effb7528b: {r: 0, g: 0.46757713, b: 2.6082387, a: 0} - EmissiveColor: {r: 0, g: 0, b: 0, a: 0} - - _AdditionalColor: {r: 4.597549, g: 0.36867145, b: 0.5674405, a: 0} + - _AdditionalColor: {r: 95.87453, g: 7.6880527, b: 11.833063, a: 0} - _BaseColor: {r: 1, g: 1, b: 1, 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} - - _FresnelColor: {r: 2.7547174, g: 0.051819082, b: 0, a: 0} + - _FresnelColor: {r: 0.68867934, g: 0.012954771, b: 0, a: 0} - _ScanWaveColor: {r: 0, g: 0.5949242, b: 1, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _UVMul: {r: 0.01, g: 0.04, b: 0, a: 0} diff --git a/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab b/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab index f280cbb4a..3f9b6aaa8 100644 --- a/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab +++ b/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab @@ -106505,6 +106505,9 @@ MonoBehaviour: animClipName: MagicPush m_selectedType: 1 currentSelectedSpellName: + maxTurnTowardDistance: 10 + rotationSpeed: 500 + degreeThreshold: 100 actionInput: useInput: 1 isAxisInUse: 0 diff --git a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity index d1bb83ccf..7381b2e25 100644 --- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity +++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity @@ -3203,171 +3203,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 609414703} m_PrefabAsset: {fileID: 0} ---- !u!43 &14188132 -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 &14426894 GameObject: m_ObjectHideFlags: 0 @@ -24830,171 +24665,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 71285071} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!43 &72067734 -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 &72092793 GameObject: m_ObjectHideFlags: 0 @@ -26737,70 +26407,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1621475749} m_PrefabAsset: {fileID: 0} ---- !u!21 &80849471 -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 &82823665 stripped Transform: m_CorrespondingSourceObject: {fileID: 7776093709774486646, guid: 8a4e2a529ff09d24d90693c624c5356a, @@ -64465,6 +64071,171 @@ Transform: m_Children: [] m_Father: {fileID: 855922074} m_LocalEulerAnglesHint: {x: 0, y: 11.369, z: 0} +--- !u!43 &225260202 +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!114 &225684057 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3383748770551496582, guid: 851e8e61247888340bdec90fc8aa37f5, @@ -110940,7 +110711,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 2020449770} + objectReference: {fileID: 1842074021} - target: {fileID: 2614899761469592907, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -131165,7 +130936,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 14188132} + objectReference: {fileID: 225260202} - target: {fileID: 2614899761469592907, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -163496,39 +163267,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!21 &577252503 -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 &577505007 PrefabInstance: m_ObjectHideFlags: 0 @@ -199670,171 +199408,6 @@ Transform: m_Children: [] m_Father: {fileID: 782247898} m_LocalEulerAnglesHint: {x: -1.584, y: 26.427, z: -2.444} ---- !u!43 &737878787 -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 &738052467 GameObject: m_ObjectHideFlags: 0 @@ -200542,6 +200115,171 @@ Transform: m_Children: [] m_Father: {fileID: 1807495188} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &741304866 +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 &741378820 PrefabInstance: m_ObjectHideFlags: 0 @@ -321797,290 +321535,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01470a9fc5334014e96e661ea7abf07e, type: 3} ---- !u!1001 &1210456151 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3912414050132569390, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_Name - value: Big_Chest_Rebellion_Quest (1) - objectReference: {fileID: 0} - - target: {fileID: 3912414050132569390, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: selectedToolbar - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.data[0].id - value: 63 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.data[1].id - value: 18 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.data[2].id - value: 18 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.data[3].id - value: 18 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.data[4].id - value: 18 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.data[5].id - value: 18 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.data[6].id - value: 18 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.data[1].amount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.data[2].amount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.data[3].amount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.data[4].amount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: items.Array.data[5].amount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.size - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 75809413} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: - objectReference: {fileID: 75809413} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: - objectReference: {fileID: 21244052} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: TryConditionalEvent - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName - value: SendToMessageSystem - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName - value: SetActive - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName - value: PixelCrushers.QuestMachine.QuestControl, Assembly-CSharp-firstpass - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_BoolArgument - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_StringArgument - value: Seeds:Found - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260131, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_questID.m_text - value: - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260131, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_conditionalEvent.questID.m_text - value: CH01FindSeed - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260131, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_conditionalEvent.onConditionMet.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260131, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_conditionalEvent.onConditionMet.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260131, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_conditionalEvent.onConditionMet.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260131, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_conditionalEvent.onConditionMet.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260131, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_conditionalEvent.onConditionMet.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: GiveAllQuestsToQuester - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260131, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_conditionalEvent.onConditionMet.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: PixelCrushers.QuestMachine.QuestGiver, Assembly-CSharp-firstpass - objectReference: {fileID: 0} - - target: {fileID: 4218401739027260131, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_conditionalEvent.onConditionMet.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument - value: - objectReference: {fileID: 569166459} - - target: {fileID: 4218401739027260131, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_conditionalEvent.onConditionMet.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 4395653377117550484, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_LocalPosition.x - value: 202.23561 - objectReference: {fileID: 0} - - target: {fileID: 4395653377117550484, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_LocalPosition.y - value: 29.167 - objectReference: {fileID: 0} - - target: {fileID: 4395653377117550484, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_LocalPosition.z - value: -109.822525 - objectReference: {fileID: 0} - - target: {fileID: 4395653377117550484, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.09228086 - objectReference: {fileID: 0} - - target: {fileID: 4395653377117550484, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4395653377117550484, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.995733 - objectReference: {fileID: 0} - - target: {fileID: 4395653377117550484, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4395653377117550484, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4395653377117550484, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -169.41 - objectReference: {fileID: 0} - - target: {fileID: 4395653377117550484, guid: b2b5974df0875904a9cb6d3284e2ffe1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 4218401739027260131, guid: b2b5974df0875904a9cb6d3284e2ffe1, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b2b5974df0875904a9cb6d3284e2ffe1, type: 3} --- !u!1 &1210641441 GameObject: m_ObjectHideFlags: 0 @@ -343671,6 +343125,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 003daaab58a32ca419f0a3ef3dbef864, type: 3} +--- !u!21 &1286689258 +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 &1286890651 stripped Transform: m_CorrespondingSourceObject: {fileID: 7010295873574804791, guid: 04725a9f715fb81489cf487693f4505c, @@ -345333,6 +344851,171 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 302652414} m_SourcePrefab: {fileID: 100100000, guid: 003daaab58a32ca419f0a3ef3dbef864, type: 3} +--- !u!43 &1302502695 +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 &1302867943 stripped Transform: m_CorrespondingSourceObject: {fileID: 7640216214748562278, guid: a88fa99440bef9044a2da20b7b3aac10, @@ -431543,6 +431226,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1598011122} m_PrefabAsset: {fileID: 0} +--- !u!21 &1598085097 +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 &1598675280 GameObject: m_ObjectHideFlags: 0 @@ -458169,42 +457885,42 @@ PrefabInstance: - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -135 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210.00003 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 693080501376609525, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -459074,22 +458790,22 @@ PrefabInstance: - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -225 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4550431665386167607, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -459124,22 +458840,22 @@ PrefabInstance: - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -315 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4816445967174237075, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -459601,6 +459317,16 @@ PrefabInstance: propertyPath: startItems.Array.size value: 14 objectReference: {fileID: 0} + - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: itemsFilter.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: 'itemsFilter.Array.data[0]' + value: 11 + objectReference: {fileID: 0} - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: startItems.Array.data[1].id @@ -459674,7 +459400,7 @@ PrefabInstance: - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: startItems.Array.data[15].id - value: 1 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -459949,12 +459675,12 @@ PrefabInstance: - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: startItems.Array.data[15].autoEquip - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: startItems.Array.data[15].indexArea - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -460744,22 +460470,22 @@ PrefabInstance: - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7577249534107784839, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -482857,74 +482583,6 @@ 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 @@ -503235,6 +502893,171 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1841437100} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!43 &1842074021 +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 &1842201368 PrefabInstance: m_ObjectHideFlags: 0 @@ -545779,171 +545602,6 @@ MonoBehaviour: subPoints: [] randomPatrolPoint: 0 rotateTo: 1 ---- !u!43 &2020449770 -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 &2020792536 PrefabInstance: m_ObjectHideFlags: 0 @@ -632677,7 +632335,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 577252503} + - {fileID: 1598085097} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -632770,7 +632428,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 80849471} + overrideMaterial: {fileID: 1286689258} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 @@ -682216,7 +681874,6 @@ SceneRoots: - {fileID: 39249907} - {fileID: 830322572} - {fileID: 464238094} - - {fileID: 1210456151} - {fileID: 1537884500} - {fileID: 1995318090} - {fileID: 1381553017} @@ -682241,6 +681898,5 @@ SceneRoots: - {fileID: 1373167343} - {fileID: 18198455} - {fileID: 2062553764} - - {fileID: 1794824499} - {fileID: 118764201012096022} - {fileID: 4641350462819449092} diff --git a/Assets/Scripts/Characters/Skills/MagicAttacks.cs b/Assets/Scripts/Characters/Skills/MagicAttacks.cs index 8f8657e4b..82de8b082 100644 --- a/Assets/Scripts/Characters/Skills/MagicAttacks.cs +++ b/Assets/Scripts/Characters/Skills/MagicAttacks.cs @@ -12,6 +12,7 @@ using UnityEngine.Events; using UnityEngine.VFX; using static Invector.vObjectDamage; using DG.Tweening; +using Invector.vCharacterController.AI.FSMBehaviour; namespace Beyond { @@ -61,6 +62,15 @@ namespace Beyond private ShieldCollisionController shieldCollisionController; private bool canPlayNoFaithClip = true; private bool canPlayCantDoClip = true; + [BoxGroup("Auto targetting")] + public float maxTurnTowardDistance = 10f; + [BoxGroup("Auto targetting")] + public float rotationSpeed = 500f; + [BoxGroup("Auto targetting")] + public float degreeThreshold = 100; + + + public UnityAction onHitFireball; @@ -191,7 +201,8 @@ namespace Beyond private IEnumerator FlameThrowerhCoroutine() { EffectDesc flameThrowe = m_effects[(int)EffectType.FLAME_THROWER]; - yield return new WaitForSeconds(flameThrowe.startTime); + //yield return new WaitForSeconds(flameThrowe.startTime); + yield return TurnTowardTargetCoroutine(flameThrowe.startTime); flameDamager.enabled = true; flame.Play(); yield return new WaitForSeconds(flameThrowe.endTime); @@ -246,10 +257,21 @@ namespace Beyond StartCoroutine(FireballCoroutine()); } + private IEnumerator TurnTowardTargetCoroutine(float maxTime) + { + float time = 0; + while (time < maxTime) + { + time += Time.deltaTime; + LerpRotation(); + yield return null; + } + yield return null; } private IEnumerator FireballCoroutine() { EffectDesc fireball = m_effects[(int)EffectType.FIREBALL]; - yield return new WaitForSeconds(fireball.startTime); + //yield return new WaitForSeconds(fireball.startTime); + yield return TurnTowardTargetCoroutine(fireball.startTime); var fireballClone = Instantiate(fireball.effectObject, fireball.effectObject.transform.position, fireball.effectObject.transform.rotation); fireballClone.SetActive(true); RFX4_PhysicsMotion fireballMotionController = fireballClone.GetComponentInChildren(); //could maybe add some reference container to use get component without children @@ -478,6 +500,72 @@ namespace Beyond selectedEffect = GetCurrentlySelectedPower(); } + private void LerpRotation() + { + + float minDist = maxTurnTowardDistance; + var enemy = GetNearestEnemy(ref minDist); + + if (!IsEnemyInAngleRange(enemy)) + { + return; + } + + Transform playerTransform = Player.Instance.transform; + var toEnemy = enemy.transform.position - playerTransform.position; + toEnemy.y = 0f; + toEnemy.Normalize(); + + Quaternion targetRot = + Quaternion.LookRotation(toEnemy); + + var rotation = playerTransform.rotation; + rotation = Quaternion.RotateTowards(rotation, targetRot, Time.deltaTime * rotationSpeed); + //rotation = Quaternion.Lerp(rotation, targetRot, Time.deltaTime * rotationSpeed); + playerTransform.rotation = rotation; + } + + private bool IsEnemyInAngleRange(vFSMBehaviourController ai) + { + if (ai == null) + { + return false; + } + + Vector3 playerFwd = Player.Instance.transform.forward; + Vector3 target = (ai.transform.forward - playerFwd).normalized; + + float dot = Vector3.Dot(playerFwd, target ); + float angle = 180f - Mathf.Acos(dot) * Mathf.Rad2Deg; + //Debug.Log("IsEnemyInAngleRange: angle: "+angle); + + if (angle > degreeThreshold) + { + return false; + } + + return true; + } + private vFSMBehaviourController GetNearestEnemy(ref float minDist) + { + var controllers = GameStateManager.Instance.GetActiveCombatcontrollers(); + Vector3 playerPos = Player.Instance.transform.position; + vFSMBehaviourController ctrl = null; + foreach (var aic in controllers) + { + var dist2 = aic.transform.position - Player.Instance.transform.position; + dist2.y = 0f; + if (dist2.magnitude < minDist) + { + ctrl = aic; + minDist = dist2.magnitude; + } + } + + return ctrl; + } + + protected virtual void AnimationBehaviour() { // know if the animation is playing or not diff --git a/Assets/Shaders/DistortedSceneColor.shadersubgraph b/Assets/Shaders/DistortedSceneColor.shadersubgraph index 77a7eecf8..dd86b8945 100644 --- a/Assets/Shaders/DistortedSceneColor.shadersubgraph +++ b/Assets/Shaders/DistortedSceneColor.shadersubgraph @@ -220,6 +220,7 @@ "m_OutputNode": { "m_Id": "35580cbe7e324ac9b5a2d95328e64725" }, + "m_SubDatas": [], "m_ActiveTargets": [] } @@ -321,6 +322,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -353,6 +355,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -420,6 +423,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -486,6 +490,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -538,6 +543,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -570,6 +576,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -583,8 +590,8 @@ "m_ObjectId": "484016ef888d4dd7a1c939b5fbcaf0e5", "m_Title": "Distortion", "m_Position": { - "x": -1894.5008544921875, - "y": -814.9999389648438 + "x": -999.0000610351563, + "y": -576.0 } } @@ -648,6 +655,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -692,6 +700,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -709,7 +718,7 @@ "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": { - "e00": 0.009999999776482582, + "e00": 0.03999999910593033, "e01": 2.0, "e02": 2.0, "e03": 2.0, @@ -844,7 +853,7 @@ "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": { - "e00": 0.10000000149011612, + "e00": 0.05000000074505806, "e01": 2.0, "e02": 2.0, "e03": 2.0, @@ -915,7 +924,7 @@ "m_Hidden": false, "m_ShaderOutputName": "Scale", "m_StageCapability": 3, - "m_Value": 25.0, + "m_Value": 8.300000190734864, "m_DefaultValue": 10.0, "m_Labels": [] } @@ -1052,6 +1061,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1205,6 +1215,7 @@ ], "m_Precision": 1, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 2, "m_CustomColors": { "m_SerializableColors": [] @@ -1302,7 +1313,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.GradientNoiseNode", "m_ObjectId": "ddce5c911d1a4545ab2913a885087044", "m_Group": { @@ -1335,10 +1346,12 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] - } + }, + "m_HashType": 0 } { diff --git a/Assets/Shaders/InvisibleMat.mat b/Assets/Shaders/InvisibleMat.mat index 11151ceef..2dbc9fae9 100644 --- a/Assets/Shaders/InvisibleMat.mat +++ b/Assets/Shaders/InvisibleMat.mat @@ -31,6 +31,10 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - BaseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BaseMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -106,6 +110,7 @@ Material: - _AlphaClipThreshold: 0.5 - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _CastShadows: 1 - _ClearCoatMask: 0 diff --git a/Assets/Shaders/InvisibleMat.shadergraph b/Assets/Shaders/InvisibleMat.shadergraph index 1b53dd0b6..bbe8a6a78 100644 --- a/Assets/Shaders/InvisibleMat.shadergraph +++ b/Assets/Shaders/InvisibleMat.shadergraph @@ -3,6 +3,9 @@ "m_Type": "UnityEditor.ShaderGraph.GraphData", "m_ObjectId": "fbf3dcea73f94d18b6a40dca18a49299", "m_Properties": [ + { + "m_Id": "5f2633c7a3164480af2ab5ed0e40a3e3" + }, { "m_Id": "44af42756f5c475dbbe8ac0dde6b9ffd" }, @@ -127,15 +130,9 @@ { "m_Id": "a6e12134a7f94b5a9a68ffba917304ad" }, - { - "m_Id": "9e3a6cbb87884c9b94dcef5eba491f84" - }, { "m_Id": "2522069299444eb88b6eba318ddd0ffa" }, - { - "m_Id": "7c64b659fd5549ef9df3a992430cc620" - }, { "m_Id": "00d667c4647549be9d5120db56be9121" }, @@ -204,6 +201,30 @@ }, { "m_Id": "98ba1bc5ebac4a9c9e65a3c244619107" + }, + { + "m_Id": "98d6b02b6e2c427099d971166e08f545" + }, + { + "m_Id": "a50383c1d6ea4c63a365fd22920bc12f" + }, + { + "m_Id": "2a697cf738744325878332ce4e2439f9" + }, + { + "m_Id": "9e9a853cee2942428bfed571765fdb43" + }, + { + "m_Id": "255d480eb64f43f2871aa10ebb298787" + }, + { + "m_Id": "658f4dcab5dd4a13ae2636f12acb30e6" + }, + { + "m_Id": "f723d68fa9f24631bb9cd5c29e7211e9" + }, + { + "m_Id": "89e6757f6e704d9d8685e0aca8e0b0c6" } ], "m_GroupDatas": [ @@ -250,9 +271,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "9e3a6cbb87884c9b94dcef5eba491f84" + "m_Id": "98ba1bc5ebac4a9c9e65a3c244619107" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -300,13 +321,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "2522069299444eb88b6eba318ddd0ffa" + "m_Id": "255d480eb64f43f2871aa10ebb298787" }, - "m_SlotId": 2 + "m_SlotId": 3 }, "m_InputSlot": { "m_Node": { - "m_Id": "7c64b659fd5549ef9df3a992430cc620" + "m_Id": "89e6757f6e704d9d8685e0aca8e0b0c6" }, "m_SlotId": 0 } @@ -339,6 +360,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2a697cf738744325878332ce4e2439f9" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "9e9a853cee2942428bfed571765fdb43" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -437,6 +472,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "658f4dcab5dd4a13ae2636f12acb30e6" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "255d480eb64f43f2871aa10ebb298787" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -507,20 +556,6 @@ "m_SlotId": 874798626 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "7c64b659fd5549ef9df3a992430cc620" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "98ba1bc5ebac4a9c9e65a3c244619107" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -577,6 +612,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "89e6757f6e704d9d8685e0aca8e0b0c6" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "2d546da5f6f34173b0d42f372707ba16" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -628,7 +677,21 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "2d546da5f6f34173b0d42f372707ba16" + "m_Id": "89e6757f6e704d9d8685e0aca8e0b0c6" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "98ba1bc5ebac4a9c9e65a3c244619107" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "a50383c1d6ea4c63a365fd22920bc12f" }, "m_SlotId": 0 } @@ -650,15 +713,15 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "9e3a6cbb87884c9b94dcef5eba491f84" + "m_Id": "9e9a853cee2942428bfed571765fdb43" }, - "m_SlotId": 2 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "7c64b659fd5549ef9df3a992430cc620" + "m_Id": "255d480eb64f43f2871aa10ebb298787" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -824,16 +887,16 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "9e3a6cbb87884c9b94dcef5eba491f84" + "m_Id": "255d480eb64f43f2871aa10ebb298787" }, - "m_SlotId": 0 + "m_SlotId": 1 } } ], "m_VertexContext": { "m_Position": { - "x": 883.999755859375, - "y": -118.0000228881836 + "x": 1085.0001220703125, + "y": -156.00001525878907 }, "m_Blocks": [ { @@ -849,8 +912,8 @@ }, "m_FragmentContext": { "m_Position": { - "x": 883.999755859375, - "y": 79.99994659423828 + "x": 1264.0, + "y": 53.999977111816409 }, "m_Blocks": [ { @@ -861,6 +924,12 @@ }, { "m_Id": "5d184e2f083a4f6d86c1d10d287430b4" + }, + { + "m_Id": "98d6b02b6e2c427099d971166e08f545" + }, + { + "m_Id": "a50383c1d6ea4c63a365fd22920bc12f" } ] }, @@ -897,10 +966,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -429.0000305175781, - "y": -104.50003051757813, - "width": 157.00003051757813, - "height": 34.000030517578128 + "x": -839.0001220703125, + "y": -553.0000610351563, + "width": 157.0001220703125, + "height": 34.00006103515625 } }, "m_Slots": [ @@ -1095,8 +1164,8 @@ "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": { - "e00": 10.0, - "e01": 10.0, + "e00": 5.0, + "e01": 5.0, "e02": 0.0, "e03": 0.0, "e10": 0.0, @@ -1317,38 +1386,14 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "0e991b9e41fb4dbc9f48fcc5b38a3923", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", "m_ObjectId": "0ee583451d984067b9fc332bf09f761e", "m_Title": "Distortion", "m_Position": { - "x": -1924.0001220703125, - "y": -845.0 + "x": -2333.999755859375, + "y": -1293.9998779296875 } } @@ -1415,6 +1460,19 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "120853914357465595646da5edaa94f5", + "m_Id": 0, + "m_DisplayName": "BaseTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", @@ -1445,6 +1503,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "12fcf8bc21404730b69e2775b1d09f45", + "m_Id": 0, + "m_DisplayName": "Smoothness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Smoothness", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -1592,10 +1665,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1763.0, - "y": -272.0000305175781, - "width": 274.0, - "height": 375.0000305175781 + "x": -1817.9998779296875, + "y": -372.00006103515627, + "width": 273.9998779296875, + "height": 375.0 } }, "m_Slots": [ @@ -1725,8 +1798,8 @@ "m_ShaderOutputName": "MinMax", "m_StageCapability": 3, "m_Value": { - "x": -0.5, - "y": 0.4000000059604645 + "x": -0.27000001072883608, + "y": 0.9800000190734863 }, "m_DefaultValue": { "x": -0.5, @@ -1786,10 +1859,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -207.5, - "y": -379.9999694824219, - "width": 208.0, - "height": 302.0000305175781 + "x": -544.0, + "y": -840.0, + "width": 207.99993896484376, + "height": 302.0 } }, "m_Slots": [ @@ -1817,6 +1890,52 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.LerpNode", + "m_ObjectId": "255d480eb64f43f2871aa10ebb298787", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Lerp", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 94.99996185302735, + "y": -430.0000915527344, + "width": 207.99993896484376, + "height": 326.0000915527344 + } + }, + "m_Slots": [ + { + "m_Id": "e9f8931989f14ce4aecf8a1b180cde55" + }, + { + "m_Id": "c8830d3343b74c9d87c833c93dcb2e6c" + }, + { + "m_Id": "fdc05782fc464db78943ae3a91887f1f" + }, + { + "m_Id": "d04f2deb6feb468f8fde3cc7460051ed" + } + ], + "synonyms": [ + "mix", + "blend", + "linear interpolate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1904,10 +2023,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1739.500244140625, - "y": -765.9999389648438, - "width": 206.0001220703125, - "height": 130.5 + "x": -2149.0, + "y": -1219.0, + "width": 206.0, + "height": 130.0 } }, "m_Slots": [ @@ -2007,6 +2126,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "2a697cf738744325878332ce4e2439f9", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -554.0, + "y": -482.00006103515627, + "width": 128.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "120853914357465595646da5edaa94f5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "5f2633c7a3164480af2ab5ed0e40a3e3" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2366,6 +2521,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3e085d177f3c40209564461bae42c095", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -2404,26 +2574,17 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "409462c524f946f0b86d9675c34701f7", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "41e904371121423b8acc7fb2900ec663", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "B", + "m_ShaderOutputName": "Out", "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] } { @@ -2469,12 +2630,6 @@ } } -{ - "m_SGVersion": 2, - "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", - "m_ObjectId": "44c4811ede6c4d4aaf7f6c3d14ef5290" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -2557,6 +2712,30 @@ "m_SerializedDescriptor": "VertexDescription.Position" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "476f0e079dce4abd84ac16a3e838c922", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2968,6 +3147,36 @@ "m_ColorMode": 1 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "5f2633c7a3164480af2ab5ed0e40a3e3", + "m_Guid": { + "m_GuidSerialized": "624b03c0-abe6-4a0d-82bb-ebbd19629d2b" + }, + "m_Name": "BaseTex", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "BaseTex", + "m_DefaultReferenceName": "_BaseTex", + "m_OverrideReferenceName": "BaseTex", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3007,6 +3216,49 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1Node", + "m_ObjectId": "658f4dcab5dd4a13ae2636f12acb30e6", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Float", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -26.311307907104493, + "y": -42.928932189941409, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "f750fe7d37b948cd9ca7c7628e233ae9" + }, + { + "m_Id": "41e904371121423b8acc7fb2900ec663" + } + ], + "synonyms": [ + "Vector 1", + "1", + "v1", + "vec1", + "scalar" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Value": 0.0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -3095,6 +3347,24 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "6bca6bb68b744640ae8b3e0345e66c6d", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", @@ -3107,9 +3377,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 340.0, - "y": 161.0, - "width": 303.0, + "x": 342.00006103515627, + "y": 152.0, + "width": 303.00006103515627, "height": 471.0 } }, @@ -3255,6 +3525,30 @@ "m_ColorMode": 1 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "6ee04778c8254cc8843cfc83b15e4fd1", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", @@ -3503,49 +3797,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.AddNode", - "m_ObjectId": "7c64b659fd5549ef9df3a992430cc620", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Add", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -80.5, - "y": -33.0, - "width": 208.0, - "height": 302.0 - } - }, - "m_Slots": [ - { - "m_Id": "e9fbfa6cdfea490cab87ed6838becf97" - }, - { - "m_Id": "f3e1ab2627eb49499428c9a4a5848837" - }, - { - "m_Id": "0e991b9e41fb4dbc9f48fcc5b38a3923" - } - ], - "synonyms": [ - "addition", - "sum", - "plus" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -3622,9 +3873,9 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -1899.500244140625, - "y": -612.9999389648438, - "width": 79.0001220703125, + "x": -2309.0, + "y": -1066.0, + "width": 79.0, "height": 77.0 } }, @@ -3824,9 +4075,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1773.000244140625, - "y": -617.9999389648438, - "width": 126.0001220703125, + "x": -2183.0, + "y": -1071.0, + "width": 126.0, "height": 118.0 } }, @@ -3890,6 +4141,9 @@ }, { "m_Id": "f2cbebd44e4c44448f164aba73ab60b8" + }, + { + "m_Id": "5f2633c7a3164480af2ab5ed0e40a3e3" } ] } @@ -3906,10 +4160,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2570.000244140625, - "y": -129.00001525878907, + "x": -2513.0, + "y": -118.0, "width": 208.0, - "height": 302.00006103515627 + "height": 302.0 } }, "m_Slots": [ @@ -3933,6 +4187,49 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "89e6757f6e704d9d8685e0aca8e0b0c6", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 877.0000610351563, + "y": -16.999971389770509, + "width": 208.00006103515626, + "height": 302.0000305175781 + } + }, + "m_Slots": [ + { + "m_Id": "476f0e079dce4abd84ac16a3e838c922" + }, + { + "m_Id": "6ee04778c8254cc8843cfc83b15e4fd1" + }, + { + "m_Id": "e5acc97a27ac40eeab55f399bd1b5b61" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -4052,10 +4349,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1370.0, - "y": -240.0, - "width": 120.0, - "height": 149.00001525878907 + "x": -1425.0, + "y": -340.00006103515627, + "width": 120.0001220703125, + "height": 149.00003051757813 } }, "m_Slots": [ @@ -4099,9 +4396,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1458.000244140625, - "y": -727.5, - "width": 208.0001220703125, + "x": -1868.0, + "y": -1180.0, + "width": 208.0, "height": 302.0 } }, @@ -4245,10 +4542,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 667.0, - "y": 9.0, - "width": 130.0, - "height": 118.0 + "x": 676.0000610351563, + "y": 14.000024795532227, + "width": 129.99993896484376, + "height": 117.99999237060547 } }, "m_Slots": [ @@ -4276,6 +4573,40 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "98d6b02b6e2c427099d971166e08f545", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Smoothness", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "12fcf8bc21404730b69e2775b1d09f45" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Smoothness" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -4336,10 +4667,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -558.0000610351563, - "y": -544.0, - "width": 208.0, - "height": 302.0 + "x": -968.0, + "y": -993.0, + "width": 207.99993896484376, + "height": 301.99993896484377 } }, "m_Slots": [ @@ -4399,26 +4730,17 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "9dbc53807d3b468495442c4bd180bc91", - "m_Id": 2, - "m_DisplayName": "Out", + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "9d5e48046bec43558d7f69d044ac3d40", + "m_Id": 5, + "m_DisplayName": "G", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] } { @@ -4451,45 +4773,62 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.AddNode", - "m_ObjectId": "9e3a6cbb87884c9b94dcef5eba491f84", + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "9e9a853cee2942428bfed571765fdb43", "m_Group": { "m_Id": "" }, - "m_Name": "Add", + "m_Name": "Sample Texture 2D", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -415.49993896484377, - "y": 13.5, - "width": 208.0, - "height": 302.0 + "x": -415.0000305175781, + "y": -468.00006103515627, + "width": 183.00006103515626, + "height": 249.0000457763672 } }, "m_Slots": [ { - "m_Id": "acf1bff0c431421d91e1480d146c0861" + "m_Id": "ee57ce23bb2e455c92a17bed0eebc876" }, { - "m_Id": "409462c524f946f0b86d9675c34701f7" + "m_Id": "df2f714fe931435d97593b19be90b30f" }, { - "m_Id": "9dbc53807d3b468495442c4bd180bc91" + "m_Id": "9d5e48046bec43558d7f69d044ac3d40" + }, + { + "m_Id": "fb046f24dc544e20b860f4e5d09a79b4" + }, + { + "m_Id": "3e085d177f3c40209564461bae42c095" + }, + { + "m_Id": "6bca6bb68b744640ae8b3e0345e66c6d" + }, + { + "m_Id": "c5bf0fd7060547f991fb1370285eb5b8" + }, + { + "m_Id": "c0fd2bf892bd4e9781d3078a11e9b98c" } ], "synonyms": [ - "addition", - "sum", - "plus" + "tex2d" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] - } + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 } { @@ -4580,6 +4919,40 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "a50383c1d6ea4c63a365fd22920bc12f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Emission", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "eb038844265746e98325626119425d38" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Emission" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -4700,10 +5073,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2129.0, - "y": -367.0000305175781, - "width": 208.0, - "height": 302.0 + "x": -2183.999755859375, + "y": -467.0000305175781, + "width": 129.999755859375, + "height": 117.99996948242188 } }, "m_Slots": [ @@ -4746,30 +5119,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "acf1bff0c431421d91e1480d146c0861", - "m_Id": 0, - "m_DisplayName": "A", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -4895,9 +5244,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -839.500244140625, - "y": -617.9999389648438, - "width": 208.000244140625, + "x": -1249.0, + "y": -1067.0, + "width": 208.0, "height": 301.99993896484377 } }, @@ -5218,6 +5567,19 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "c0fd2bf892bd4e9781d3078a11e9b98c", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5228,11 +5590,33 @@ "m_Hidden": false, "m_ShaderOutputName": "Scale", "m_StageCapability": 3, - "m_Value": 19.399999618530275, + "m_Value": 10.0, "m_DefaultValue": 10.0, "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "c5bf0fd7060547f991fb1370285eb5b8", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5263,6 +5647,36 @@ "m_Labels": [] } +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", + "m_ObjectId": "c7f6c20f44d24a38ac95194b3204739e" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "c8830d3343b74c9d87c833c93dcb2e6c", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5371,6 +5785,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "d04f2deb6feb468f8fde3cc7460051ed", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5398,10 +5836,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -256.0, - "y": -810.5, - "width": 208.0, - "height": 326.0000305175781 + "x": -666.0, + "y": -1259.0, + "width": 207.99993896484376, + "height": 326.0 } }, "m_Slots": [ @@ -5466,7 +5904,7 @@ "m_ObjectId": "d898233e75874a108f4989dcd52f07bb", "m_Datas": [], "m_ActiveSubTarget": { - "m_Id": "44c4811ede6c4d4aaf7f6c3d14ef5290" + "m_Id": "c7f6c20f44d24a38ac95194b3204739e" }, "m_AllowMaterialOverride": true, "m_SurfaceType": 1, @@ -5537,6 +5975,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "df2f714fe931435d97593b19be90b30f", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", @@ -5638,6 +6091,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "e5acc97a27ac40eeab55f399bd1b5b61", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.CategoryData", @@ -5713,10 +6190,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1906.0, - "y": -274.0, + "x": -1960.9998779296875, + "y": -374.0000305175781, "width": 131.0, - "height": 34.0 + "height": 33.999969482421878 } }, "m_Slots": [ @@ -5740,7 +6217,7 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "e9fbfa6cdfea490cab87ed6838becf97", + "m_ObjectId": "e9f8931989f14ce4aecf8a1b180cde55", "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, @@ -5761,6 +6238,36 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "eb038844265746e98325626119425d38", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Emission", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5776,6 +6283,31 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "ee57ce23bb2e455c92a17bed0eebc876", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -5903,6 +6435,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f1cdafa1ea62422a836875b843754593", + "m_Id": 0, + "m_DisplayName": "alpha", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5946,30 +6493,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "f3e1ab2627eb49499428c9a4a5848837", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -5998,6 +6521,57 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "f723d68fa9f24631bb9cd5c29e7211e9", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 936.0, + "y": 115.0, + "width": 104.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "f1cdafa1ea62422a836875b843754593" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "da5809dc06c74a3cb8975016fa715e11" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f750fe7d37b948cd9ca7c7628e233ae9", + "m_Id": 1, + "m_DisplayName": "X", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "X", + "m_StageCapability": 3, + "m_Value": 0.4000000059604645, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.GradientNoiseNode", @@ -6010,10 +6584,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1128.000244140625, - "y": -786.5, - "width": 208.000244140625, - "height": 302.0 + "x": -1538.0, + "y": -1235.0, + "width": 207.9998779296875, + "height": 336.0 } }, "m_Slots": [ @@ -6122,6 +6696,45 @@ "m_SerializedDescriptor": "SurfaceDescription.Alpha" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "fb046f24dc544e20b860f4e5d09a79b4", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "fdc05782fc464db78943ae3a91887f1f", + "m_Id": 2, + "m_DisplayName": "T", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "T", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", @@ -6212,10 +6825,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -731.5, - "y": 343.5, - "width": 207.9998779296875, - "height": 278.0 + "x": -399.0001220703125, + "y": -224.00003051757813, + "width": 208.0001220703125, + "height": 279.00006103515627 } }, "m_Slots": [