diff --git a/Assets/Meshes/scroll/scrollMat2D.mat b/Assets/Meshes/scroll/scrollMat2D.mat index 1d2faacab..f072a9e34 100644 --- a/Assets/Meshes/scroll/scrollMat2D.mat +++ b/Assets/Meshes/scroll/scrollMat2D.mat @@ -138,7 +138,7 @@ Material: - _MaxBrightness: 1 - _Metallic: 0 - _MinBrightness: 0 - - _NoiseScale: 1.6003845 + - _NoiseScale: 1.0038235 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueControl: 0 diff --git a/Assets/Scenes/Land_01/demo_postptrocesINTRO.unity b/Assets/Scenes/Land_01/demo_postptrocesINTRO.unity index 4815ad612..c53f5322e 100644 --- a/Assets/Scenes/Land_01/demo_postptrocesINTRO.unity +++ b/Assets/Scenes/Land_01/demo_postptrocesINTRO.unity @@ -74903,8 +74903,8 @@ Transform: m_GameObject: {fileID: 286263010} serializedVersion: 2 m_LocalRotation: {x: -0.0023535984, y: -0.781285, z: 0.0011465873, w: 0.62416905} - m_LocalPosition: {x: 35.839996, y: 32.99, z: -196} - m_LocalScale: {x: 18.29666, y: 22.422419, z: 7.352154} + m_LocalPosition: {x: 39.44, y: 34.1, z: -194.11} + m_LocalScale: {x: 18.29666, y: 22.422419, z: 3.4916952} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 190662092} @@ -103484,6 +103484,70 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2015636647} m_PrefabAsset: {fileID: 0} +--- !u!21 &398873626 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Override + m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _DIRECTIONALL: 1 + - _DirectionalFalloff: 2 + - _DirectionalIntensity: 1 + - _DirectionalMode: 1 + - _FOGG: 1 + - _FogAxisMode: 1 + - _FogColorDuo: 1 + - _FogDistanceEnd: 200 + - _FogDistanceFalloff: 2 + - _FogDistanceStart: -200 + - _FogHeightEnd: 200 + - _FogHeightFalloff: 2 + - _FogHeightStart: 0 + - _FogIntensity: 1 + - _FogLayersMode: 0 + - _IsHeightFogPreset: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _NOISEE: 1 + - _NoiseDistanceEnd: 50 + - _NoiseIntensity: 1 + - _NoiseMode: 2 + - _NoiseModeBlend: 1 + - _NoiseScale: 30 + - _SKYBOXX: 1 + - _SkyboxFogFalloff: 1 + - _SkyboxFogFill: 1 + - _SkyboxFogHeight: 1 + - _SkyboxFogIntensity: 1 + - _TITLE: 1 + m_Colors: + - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} + - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} + - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} + - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} + - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} + - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1001 &399398345 PrefabInstance: m_ObjectHideFlags: 0 @@ -111219,6 +111283,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 417577482} m_PrefabAsset: {fileID: 0} +--- !u!43 &417727337 +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 &418288556 GameObject: m_ObjectHideFlags: 0 @@ -132592,7 +132821,7 @@ PrefabInstance: - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, type: 3} propertyPath: selectedToolbar - value: 0 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, type: 3} @@ -132692,7 +132921,7 @@ PrefabInstance: - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, type: 3} propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_Mode - value: 6 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, type: 3} @@ -132718,7 +132947,7 @@ PrefabInstance: type: 3} propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 7383310071487003632} - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, type: 3} propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_CallState @@ -132742,7 +132971,7 @@ PrefabInstance: - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, type: 3} propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName - value: SetActive + value: OnUse objectReference: {fileID: 0} - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, type: 3} @@ -132757,7 +132986,7 @@ PrefabInstance: - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, type: 3} propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine + value: PixelCrushers.DialogueSystem.Wrappers.DialogueSystemTrigger, Assembly-CSharp-firstpass objectReference: {fileID: 0} - target: {fileID: 4218401739027260130, guid: b2b5974df0875904a9cb6d3284e2ffe1, type: 3} @@ -179320,171 +179549,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 652185831} m_PrefabAsset: {fileID: 0} ---- !u!43 &652883440 -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 &653237869 PrefabInstance: m_ObjectHideFlags: 0 @@ -203396,6 +203460,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 15333145} m_PrefabAsset: {fileID: 0} +--- !u!43 &746679004 +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 &747138429 PrefabInstance: m_ObjectHideFlags: 0 @@ -279691,7 +279920,7 @@ Transform: m_GameObject: {fileID: 1044279095} serializedVersion: 2 m_LocalRotation: {x: -0.018184127, y: 0.97297466, z: 0.017756684, w: 0.22950901} - m_LocalPosition: {x: 37.35, y: 33, z: -207.6} + m_LocalPosition: {x: 36.12, y: 33, z: -209.57} m_LocalScale: {x: 10.049715, y: 7.984908, z: 2.8567665} m_ConstrainProportionsScale: 0 m_Children: [] @@ -279762,19 +279991,6 @@ MonoBehaviour: onExecute: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 3364015289354638852} - m_TargetAssemblyTypeName: PixelCrushers.DialogueSystem.DialogueSystemTrigger, - Assembly-CSharp-firstpass - m_MethodName: OnUse - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_Target: {fileID: 3178886243573974929} m_TargetAssemblyTypeName: Beyond.BarkManager, Assembly-CSharp m_MethodName: PlayBark @@ -329188,70 +329404,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1220713760} m_Mesh: {fileID: -8436513303791760402, guid: c657cbeb7189a6e4faa250e8810ddfa5, type: 3} ---- !u!21 &1220843100 -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 &1221096076 stripped Transform: m_CorrespondingSourceObject: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, @@ -385084,39 +385236,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!21 &1460699565 -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 &1461023986 PrefabInstance: m_ObjectHideFlags: 0 @@ -385323,171 +385442,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8a3ec77528370a49b71b7a7568101e0, type: 3} ---- !u!43 &1462667399 -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 &1462677416 PrefabInstance: m_ObjectHideFlags: 0 @@ -432940,6 +432894,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1598011122} m_PrefabAsset: {fileID: 0} +--- !u!21 &1598200834 +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 &1598762916 PrefabInstance: m_ObjectHideFlags: 0 @@ -464160,163 +464147,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1686530366} m_PrefabAsset: {fileID: 0} ---- !u!1 &1686534239 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1686534240} - - component: {fileID: 1686534243} - - component: {fileID: 1686534242} - - component: {fileID: 1686534241} - m_Layer: 11 - m_Name: CH01_wasteland_vo_altar_wanderer_04 - m_TagString: Untagged - m_Icon: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1686534240 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1686534239} - serializedVersion: 2 - m_LocalRotation: {x: -0.018184127, y: 0.97297466, z: 0.017756684, w: 0.22950901} - m_LocalPosition: {x: 37.35, y: 33, z: -207.6} - m_LocalScale: {x: 10.049715, y: 7.984908, z: 2.8567665} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4162766988877471287} - m_LocalEulerAnglesHint: {x: -2.459, y: 153.488, z: -1.562} ---- !u!114 &1686534241 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1686534239} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} - m_Name: - m_EditorClassIdentifier: - trigger: 8 - fireOnce: 1 - condition: - luaConditions: [] - questConditions: [] - acceptedTags: - - Player - acceptedGameObjects: [] - luaWizardIndex: -1 - lastEvaluationValue: 0 - setQuestState: 1 - questName: WastelandKillSpiders - questState: 2 - setQuestEntryState: 0 - questEntryNumber: 1 - questEntryState: 0 - luaCode: - sequence: - sequenceSpeaker: {fileID: 0} - sequenceListener: {fileID: 0} - waitOneFrameOnStartOrEnable: 1 - alertMessage: - textTable: {fileID: 0} - alertDuration: 0 - sendMessages: [] - barkSource: 1 - barkConversation: - barkText: What land is this with spiders as big as dogs? - barkTextSequence: - barker: {fileID: 0} - barkTarget: {fileID: 0} - barkOrder: 1 - allowBarksDuringConversations: 0 - skipBarkIfNoValidEntries: 0 - cacheBarkLines: 0 - conversation: - conversationConversant: {fileID: 0} - conversationActor: {fileID: 0} - startConversationEntryID: -1 - exclusive: 0 - skipIfNoValidEntries: 0 - stopConversationOnTriggerExit: 0 - stopConversationIfTooFar: 0 - maxConversationDistance: 5 - monitorConversationDistanceFrequency: 1 - showCursorDuringConversation: 0 - pauseGameDuringConversation: 0 - setActiveActions: [] - setEnabledActions: [] - setAnimatorStateActions: [] - onExecute: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 3364015289354638852} - m_TargetAssemblyTypeName: PixelCrushers.DialogueSystem.DialogueSystemTrigger, - Assembly-CSharp-firstpass - m_MethodName: OnUse - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 3178886243573974929} - m_TargetAssemblyTypeName: Beyond.BarkManager, Assembly-CSharp - m_MethodName: PlayBark - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 45 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - useConversationTitlePicker: 1 - useBarkTitlePicker: 1 - useQuestNamePicker: 1 - selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} ---- !u!65 &1686534242 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1686534239} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1686534243 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1686534239} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1687162980 GameObject: m_ObjectHideFlags: 0 @@ -474873,6 +474703,10 @@ PrefabInstance: propertyPath: m_Name value: Scroll_Gate objectReference: {fileID: 0} + - target: {fileID: 1865896253331474, guid: 981530cfa243b844193a56ab1eb7bcff, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4815755677803522, guid: 981530cfa243b844193a56ab1eb7bcff, type: 3} propertyPath: m_LocalScale.x value: 1.2298 @@ -474925,6 +474759,36 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 1.751 objectReference: {fileID: 0} + - target: {fileID: 486999430049177648, guid: 981530cfa243b844193a56ab1eb7bcff, + type: 3} + propertyPath: m_Size.x + value: 0.7072824 + objectReference: {fileID: 0} + - target: {fileID: 486999430049177648, guid: 981530cfa243b844193a56ab1eb7bcff, + type: 3} + propertyPath: m_Size.y + value: 4.153262 + objectReference: {fileID: 0} + - target: {fileID: 486999430049177648, guid: 981530cfa243b844193a56ab1eb7bcff, + type: 3} + propertyPath: m_Size.z + value: 8.335478 + objectReference: {fileID: 0} + - target: {fileID: 486999430049177648, guid: 981530cfa243b844193a56ab1eb7bcff, + type: 3} + propertyPath: m_Center.x + value: 0.2533288 + objectReference: {fileID: 0} + - target: {fileID: 486999430049177648, guid: 981530cfa243b844193a56ab1eb7bcff, + type: 3} + propertyPath: m_Center.y + value: 2.1459568 + objectReference: {fileID: 0} + - target: {fileID: 486999430049177648, guid: 981530cfa243b844193a56ab1eb7bcff, + type: 3} + propertyPath: m_Center.z + value: -0.29053527 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -637588,6 +637452,11 @@ PrefabInstance: propertyPath: m_barks.Array.data[33].delayToStart value: 11 objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[44].delayToStart + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} propertyPath: m_barks.Array.data[108].customOutput @@ -637647,12 +637516,22 @@ PrefabInstance: propertyPath: m_barks.Array.data[114].delayToStart value: 0 objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[119].delayToStart + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} propertyPath: m_barks.Array.data[120].customOutput value: objectReference: {fileID: 7461429802988689633, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[120].delayToStart + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} propertyPath: m_barks.Array.data[76].barks.Array.size @@ -681201,7 +681080,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1460699565} + - {fileID: 1598200834} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -681294,7 +681173,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 1220843100} + overrideMaterial: {fileID: 398873626} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 @@ -682368,21 +682247,6 @@ SkinnedMeshRenderer: m_Center: {x: 0.018002823, y: 0.2710439, z: -0.34806785} m_Extent: {x: 0.31883562, y: 0.3383252, z: 0.41155395} m_DirtyAABB: 0 ---- !u!4 &3626085404458841360 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5141108707029486390} - serializedVersion: 2 - m_LocalRotation: {x: -0.018184127, y: 0.97297466, z: 0.017756684, w: 0.22950901} - m_LocalPosition: {x: 37.35, y: 33, z: -207.6} - m_LocalScale: {x: 10.049715, y: 7.984908, z: 2.8567665} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4162766988877471287} - m_LocalEulerAnglesHint: {x: -2.459, y: 153.488, z: -1.562} --- !u!4 &3633369735788595505 Transform: m_ObjectHideFlags: 0 @@ -689709,9 +689573,7 @@ Transform: - {fileID: 666699783088287411} - {fileID: 4170394451272999599} - {fileID: 1901694385194690612} - - {fileID: 3626085404458841360} - {fileID: 1044279096} - - {fileID: 1686534240} - {fileID: 4804038486248908443} - {fileID: 3302295595451007868} - {fileID: 3419068067581608289} @@ -699171,27 +699033,6 @@ Transform: m_Children: [] m_Father: {fileID: 6837399021006548317} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &4911912020412054050 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5141108707029486390} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!4 &4914787096748622060 Transform: m_ObjectHideFlags: 0 @@ -700778,25 +700619,6 @@ MonoBehaviour: useBarkTitlePicker: 1 useQuestNamePicker: 1 selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} ---- !u!1 &5141108707029486390 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3626085404458841360} - - component: {fileID: 7048311733898508333} - - component: {fileID: 4911912020412054050} - - component: {fileID: 7271853358176218254} - m_Layer: 11 - m_Name: CH01_wasteland_vo_altar_wanderer_02 - m_TagString: Untagged - m_Icon: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!114 &5155153685514308943 MonoBehaviour: m_ObjectHideFlags: 0 @@ -722850,14 +722672,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3490229580675374983} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &7048311733898508333 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5141108707029486390} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &7064132817391497485 Transform: m_ObjectHideFlags: 0 @@ -724226,100 +724040,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!114 &7271853358176218254 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5141108707029486390} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} - m_Name: - m_EditorClassIdentifier: - trigger: 8 - fireOnce: 1 - condition: - luaConditions: [] - questConditions: [] - acceptedTags: - - Player - acceptedGameObjects: [] - luaWizardIndex: -1 - lastEvaluationValue: 0 - setQuestState: 1 - questName: WastelandKillSpiders - questState: 2 - setQuestEntryState: 0 - questEntryNumber: 1 - questEntryState: 0 - luaCode: - sequence: - sequenceSpeaker: {fileID: 0} - sequenceListener: {fileID: 0} - waitOneFrameOnStartOrEnable: 1 - alertMessage: - textTable: {fileID: 0} - alertDuration: 0 - sendMessages: [] - barkSource: 1 - barkConversation: - barkText: What land is this with spiders as big as dogs? - barkTextSequence: - barker: {fileID: 0} - barkTarget: {fileID: 0} - barkOrder: 1 - allowBarksDuringConversations: 0 - skipBarkIfNoValidEntries: 0 - cacheBarkLines: 0 - conversation: - conversationConversant: {fileID: 0} - conversationActor: {fileID: 0} - startConversationEntryID: -1 - exclusive: 0 - skipIfNoValidEntries: 0 - stopConversationOnTriggerExit: 0 - stopConversationIfTooFar: 0 - maxConversationDistance: 5 - monitorConversationDistanceFrequency: 1 - showCursorDuringConversation: 0 - pauseGameDuringConversation: 0 - setActiveActions: [] - setEnabledActions: [] - setAnimatorStateActions: [] - onExecute: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 3364015289354638852} - m_TargetAssemblyTypeName: PixelCrushers.DialogueSystem.DialogueSystemTrigger, - Assembly-CSharp-firstpass - m_MethodName: OnUse - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 3178886243573974929} - m_TargetAssemblyTypeName: Beyond.BarkManager, Assembly-CSharp - m_MethodName: PlayBark - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 45 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - useConversationTitlePicker: 1 - useBarkTitlePicker: 1 - useQuestNamePicker: 1 - selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} --- !u!1 &7273115086245336664 GameObject: m_ObjectHideFlags: 0 @@ -750469,6 +750189,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7719561452752512179} m_Modifications: + - target: {fileID: 4747826753806301777, guid: edacd90c61ae041e0a75c4474d1061bc, + type: 3} + propertyPath: m_Height + value: 1.96 + objectReference: {fileID: 0} + - target: {fileID: 4747826753806301777, guid: edacd90c61ae041e0a75c4474d1061bc, + type: 3} + propertyPath: m_Radius + value: 0.52 + objectReference: {fileID: 0} - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, type: 3} propertyPath: selectedToolbar @@ -750527,12 +750257,12 @@ PrefabInstance: - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, type: 3} propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.size - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, type: 3} propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.size - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, type: 3} @@ -750634,10 +750364,15 @@ PrefabInstance: propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName value: OnUse objectReference: {fileID: 0} + - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, + type: 3} + propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 3364015289354638852} - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, type: 3} propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OnCollect + value: OnUse objectReference: {fileID: 0} - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, type: 3} @@ -750687,7 +750422,7 @@ PrefabInstance: - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, type: 3} propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Beyond.StreamedResource, Assembly-CSharp + value: PixelCrushers.DialogueSystem.Wrappers.DialogueSystemTrigger, Assembly-CSharp-firstpass objectReference: {fileID: 0} - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, type: 3} @@ -750714,6 +750449,11 @@ PrefabInstance: propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, + type: 3} + propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, type: 3} propertyPath: m_RootOrder diff --git a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat index 3375fde88..fd9bcbb81 100644 --- a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat +++ b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat @@ -65,11 +65,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _BlendOp: 0 + - _BlendOp: 2 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 1 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 09474655c..08a91467c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -849,7 +849,7 @@ PlayerSettings: webWasm2023: 0 scriptingDefineSymbols: : UNITY_POST_PROCESSING_STACK_V2 - Android: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;USE_TIMELINE;USE_NEW_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;TMP_PRESENT;ENEMIES_DISABLED;MOBILE_INPUT + Android: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;USE_TIMELINE;USE_NEW_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;TMP_PRESENT;ENEMIES_DISABLED CloudRendering: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER GameCoreScarlett: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER @@ -867,9 +867,9 @@ PlayerSettings: Standalone: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;TOUCH_REACT;GAIA_2_PRESENT;INVECTOR_AI_TEMPLATE;UPPipeline;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENEMIES_DISABLED VisionOS: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER WebGL: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER - Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;MOBILE_INPUT + Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER XboxOne: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER - iPhone: CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;GAIA_2_PRESENT;GAIA_PRO_PRESENT;UPPipeline;UNITY_POST_PROCESSING_STACK_V2;TOUCH_REACT;INVECTOR_AI_TEMPLATE;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_INVECTOR_INVENTORY;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENEMIES_DISABLED;MOBILE_INPUT + iPhone: CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;GAIA_2_PRESENT;GAIA_PRO_PRESENT;UPPipeline;UNITY_POST_PROCESSING_STACK_V2;TOUCH_REACT;INVECTOR_AI_TEMPLATE;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_INVECTOR_INVENTORY;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENEMIES_DISABLED tvOS: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER additionalCompilerArguments: {} platformArchitecture: {}