From 147c9c4312d195fa0ecdda6de7a666e4ec711d2a Mon Sep 17 00:00:00 2001 From: marcin Date: Fri, 17 Oct 2025 10:27:14 +0200 Subject: [PATCH] lamets fix, bagge dialogue and VO --- .../TestDialogueBase (Auto-Backup).asset | 198 ++-- .../TestDialogueBase (Auto-Backup).asset.meta | 2 +- Assets/Dialogue/TestDialogueBase.asset | 187 ++-- .../Scenes/02_Ruined_Town/Ruined_Town.unity | 994 ++++++++++-------- Assets/Scenes/Old_Levels!/TestHub.unity | 45 +- .../Scripts/Save/ConditionalEventTrigger.cs | 89 ++ .../Save/ConditionalEventTrigger.cs.meta | 2 + ProjectSettings/ProjectSettings.asset | 1 + 8 files changed, 869 insertions(+), 649 deletions(-) create mode 100644 Assets/Scripts/Save/ConditionalEventTrigger.cs create mode 100644 Assets/Scripts/Save/ConditionalEventTrigger.cs.meta diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset index a34b04db9..17877c76e 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset @@ -4483,11 +4483,11 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Actor - value: 6 + value: 1 type: 5 typeString: CustomFieldType_Actor - title: Conversant - value: 1 + value: 10 type: 5 typeString: CustomFieldType_Actor - title: Menu Text @@ -4495,7 +4495,8 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Dialogue Text - value: O, Vascilean, prince of the light... Why have you abandoned your people? + value: Finally, a living man! I'm in search of Lady Sidranna, do you know + her whereabouts? type: 0 typeString: CustomFieldType_Text - title: Parenthetical @@ -5130,8 +5131,8 @@ MonoBehaviour: y: 725.09894 width: 160 height: 30 - canvasScrollPosition: {x: 17.113075, y: 72.33954} - canvasZoom: 1.0600001 + canvasScrollPosition: {x: 21.885109, y: 0} + canvasZoom: 1.0300001 - id: 10 fields: - title: Title @@ -24122,13 +24123,13 @@ MonoBehaviour: - originConversationID: 96 originDialogueID: 0 destinationConversationID: 96 - destinationDialogueID: 1 + destinationDialogueID: 7 isConnector: 0 priority: 2 - originConversationID: 96 originDialogueID: 0 destinationConversationID: 96 - destinationDialogueID: 7 + destinationDialogueID: 10 isConnector: 0 priority: 2 conditionsString: @@ -24186,7 +24187,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/Q3_Beggar_n_1) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24204,81 +24205,6 @@ MonoBehaviour: - originConversationID: 96 originDialogueID: 1 destinationConversationID: 96 - destinationDialogueID: 2 - isConnector: 0 - priority: 2 - conditionsString: Variable["CH02HerbalistSpoke"] == false - userScript: - onExecute: - m_PersistentCalls: - m_Calls: [] - canvasRect: - serializedVersion: 2 - x: 19 - y: 87 - width: 160 - height: 30 - - id: 2 - fields: - - title: Title - value: - type: 0 - typeString: CustomFieldType_Text - - title: Pictures - value: '[]' - type: 3 - typeString: CustomFieldType_Files - - title: Description - value: - type: 0 - typeString: CustomFieldType_Text - - title: Actor - value: 1 - type: 5 - typeString: CustomFieldType_Actor - - title: Conversant - value: 10 - type: 5 - typeString: CustomFieldType_Actor - - title: Menu Text - value: - type: 0 - typeString: CustomFieldType_Text - - title: Dialogue Text - value: Hail, old man. - type: 0 - typeString: CustomFieldType_Text - - title: Parenthetical - value: - type: 0 - typeString: CustomFieldType_Text - - title: Audio Files - value: '[]' - type: 3 - typeString: CustomFieldType_Files - - title: Video File - value: - type: 0 - typeString: CustomFieldType_Text - - title: Sequence - value: - type: 0 - typeString: CustomFieldType_Text - - title: pl - value: - type: 4 - typeString: CustomFieldType_Localization - conversationID: 96 - isRoot: 0 - isGroup: 0 - nodeColor: - delaySimStatus: 0 - falseConditionAction: Block - conditionPriority: 2 - outgoingLinks: - - originConversationID: 96 - originDialogueID: 2 - destinationConversationID: 96 destinationDialogueID: 3 isConnector: 0 priority: 2 @@ -24289,8 +24215,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 19 - y: 130 + x: 22 + y: 216 width: 160 height: 30 - id: 3 @@ -24337,7 +24263,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/Q3_Beggar_n_2) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24365,8 +24291,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 19 - y: 180 + x: 22 + y: 355 width: 160 height: 30 - id: 4 @@ -24412,7 +24338,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/Q3_Wonderer_n_1) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24440,8 +24366,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 19 - y: 230 + x: 22 + y: 405 width: 160 height: 30 - id: 5 @@ -24487,7 +24413,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/Q3_Beggar_n_3) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24515,8 +24441,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 19 - y: 280 + x: 22 + y: 455 width: 160 height: 30 - id: 6 @@ -24562,7 +24488,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/Q3_Wonderer_n_2) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24572,7 +24498,7 @@ MonoBehaviour: - title: EventGuid value: type: 0 - typeString: + typeString: CustomFieldType_Text conversationID: 96 isRoot: 0 isGroup: 0 @@ -24588,8 +24514,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 19 - y: 330 + x: 22 + y: 505 width: 160 height: 30 - id: 7 @@ -24813,6 +24739,82 @@ MonoBehaviour: y: 182 width: 160 height: 30 + - id: 10 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: Finally, a living man! I'm in search of Lady Sidranna, do you know + her whereabouts? + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/Q3_Wonderer_n_0) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 96 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 96 + originDialogueID: 10 + destinationConversationID: 96 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + conditionsString: Variable["CH02HerbalistSpoke"] == false + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 25 + y: 101 + width: 160 + height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 - id: 97 diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta index 46b0ff76c..61d7b5e0f 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 15674542c65ddbc49aad8085fa57b1dc +guid: 3c84b775d4f6240b185527d49e09404f NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Dialogue/TestDialogueBase.asset b/Assets/Dialogue/TestDialogueBase.asset index bbf6d8ed4..6c1caadf1 100644 --- a/Assets/Dialogue/TestDialogueBase.asset +++ b/Assets/Dialogue/TestDialogueBase.asset @@ -24123,13 +24123,13 @@ MonoBehaviour: - originConversationID: 96 originDialogueID: 0 destinationConversationID: 96 - destinationDialogueID: 1 + destinationDialogueID: 7 isConnector: 0 priority: 2 - originConversationID: 96 originDialogueID: 0 destinationConversationID: 96 - destinationDialogueID: 7 + destinationDialogueID: 10 isConnector: 0 priority: 2 conditionsString: @@ -24187,7 +24187,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/Q3_Beggar_n_1) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24205,81 +24205,6 @@ MonoBehaviour: - originConversationID: 96 originDialogueID: 1 destinationConversationID: 96 - destinationDialogueID: 2 - isConnector: 0 - priority: 2 - conditionsString: Variable["CH02HerbalistSpoke"] == false - userScript: - onExecute: - m_PersistentCalls: - m_Calls: [] - canvasRect: - serializedVersion: 2 - x: 19 - y: 87 - width: 160 - height: 30 - - id: 2 - fields: - - title: Title - value: - type: 0 - typeString: CustomFieldType_Text - - title: Pictures - value: '[]' - type: 3 - typeString: CustomFieldType_Files - - title: Description - value: - type: 0 - typeString: CustomFieldType_Text - - title: Actor - value: 1 - type: 5 - typeString: CustomFieldType_Actor - - title: Conversant - value: 10 - type: 5 - typeString: CustomFieldType_Actor - - title: Menu Text - value: - type: 0 - typeString: CustomFieldType_Text - - title: Dialogue Text - value: Hail, old man. - type: 0 - typeString: CustomFieldType_Text - - title: Parenthetical - value: - type: 0 - typeString: CustomFieldType_Text - - title: Audio Files - value: '[]' - type: 3 - typeString: CustomFieldType_Files - - title: Video File - value: - type: 0 - typeString: CustomFieldType_Text - - title: Sequence - value: - type: 0 - typeString: CustomFieldType_Text - - title: pl - value: - type: 4 - typeString: CustomFieldType_Localization - conversationID: 96 - isRoot: 0 - isGroup: 0 - nodeColor: - delaySimStatus: 0 - falseConditionAction: Block - conditionPriority: 2 - outgoingLinks: - - originConversationID: 96 - originDialogueID: 2 - destinationConversationID: 96 destinationDialogueID: 3 isConnector: 0 priority: 2 @@ -24290,8 +24215,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 19 - y: 130 + x: 22 + y: 216 width: 160 height: 30 - id: 3 @@ -24338,7 +24263,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/Q3_Beggar_n_2) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24366,8 +24291,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 19 - y: 180 + x: 22 + y: 355 width: 160 height: 30 - id: 4 @@ -24413,7 +24338,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/Q3_Wonderer_n_1) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24441,8 +24366,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 19 - y: 230 + x: 22 + y: 405 width: 160 height: 30 - id: 5 @@ -24488,7 +24413,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/Q3_Beggar_n_3) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24516,8 +24441,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 19 - y: 280 + x: 22 + y: 455 width: 160 height: 30 - id: 6 @@ -24563,7 +24488,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/Q3_Wonderer_n_2) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24573,7 +24498,7 @@ MonoBehaviour: - title: EventGuid value: type: 0 - typeString: + typeString: CustomFieldType_Text conversationID: 96 isRoot: 0 isGroup: 0 @@ -24589,8 +24514,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 19 - y: 330 + x: 22 + y: 505 width: 160 height: 30 - id: 7 @@ -24814,6 +24739,82 @@ MonoBehaviour: y: 182 width: 160 height: 30 + - id: 10 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: Finally, a living man! I'm in search of Lady Sidranna, do you know + her whereabouts? + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/Q3_Wonderer_n_0) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 96 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 96 + originDialogueID: 10 + destinationConversationID: 96 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + conditionsString: Variable["CH02HerbalistSpoke"] == false + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 25 + y: 101 + width: 160 + height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 - id: 97 diff --git a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity index 9d0419c72..8774b5b89 100644 --- a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity +++ b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity @@ -46335,6 +46335,11 @@ PrefabInstance: propertyPath: triggeringLayers.m_Bits value: 256 objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: startAutomaticallyOnLoad + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, type: 3} propertyPath: barkManagerEntryIndices.Array.size @@ -46343,17 +46348,17 @@ PrefabInstance: - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, type: 3} propertyPath: 'barkManagerEntryIndices.Array.data[0]' - value: 98 + value: 97 objectReference: {fileID: 0} - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, type: 3} propertyPath: 'barkManagerEntryIndices.Array.data[1]' - value: 99 + value: 98 objectReference: {fileID: 0} - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, type: 3} propertyPath: 'barkManagerEntryIndices.Array.data[2]' - value: 100 + value: 99 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -125011,6 +125016,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 341145034} m_PrefabAsset: {fileID: 0} +--- !u!21 &771685080 +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 &772976529 PrefabInstance: m_ObjectHideFlags: 0 @@ -130861,171 +130899,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 818800096} m_PrefabAsset: {fileID: 0} ---- !u!43 &819589198 -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: 10, y: 9.72, z: 13.65} - 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: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 - 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: 10, y: 9.72, z: 13.65} - 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 &820205247 PrefabInstance: m_ObjectHideFlags: 0 @@ -140730,39 +140603,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1310651032} m_PrefabAsset: {fileID: 0} ---- !u!21 &897310239 -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 &897562200 PrefabInstance: m_ObjectHideFlags: 0 @@ -140771,6 +140611,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 878574876} m_Modifications: + - target: {fileID: 1267280949225758405, guid: dc99ca8ee3c2b0143a009d17e13de983, + type: 3} + propertyPath: displaySettings.inputSettings.alwaysForceResponseMenu + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1267280949225758409, guid: dc99ca8ee3c2b0143a009d17e13de983, type: 3} propertyPath: m_BlockingMask.m_Bits @@ -146266,6 +146111,70 @@ Transform: type: 3} m_PrefabInstance: {fileID: 933227953} m_PrefabAsset: {fileID: 0} +--- !u!21 &934523553 +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 &934542446 PrefabInstance: m_ObjectHideFlags: 0 @@ -165554,70 +165463,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1120005078} m_PrefabAsset: {fileID: 0} ---- !u!21 &1074764986 -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 &1076324344 PrefabInstance: m_ObjectHideFlags: 0 @@ -246493,6 +246338,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5f757d9f8ec3fd847b9425282b71d2a9, type: 3} +--- !u!43 &1686013631 +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: 10, y: 10, 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: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 + 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: 10, y: 10, 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 &1686406200 PrefabInstance: m_ObjectHideFlags: 0 @@ -306792,171 +306802,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1414753474} m_PrefabAsset: {fileID: 0} ---- !u!43 &1732558354 -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: 10, y: 10, 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: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 - 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: 10, y: 10, 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 &1732966608 PrefabInstance: m_ObjectHideFlags: 0 @@ -344603,6 +344448,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 919f4c6c61ceb094fb62ea8a2b6e44ba, type: 3} +--- !u!43 &1990983207 +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: 10, y: 9.72, z: 13.65} + 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: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 + 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: 10, y: 9.72, z: 13.65} + 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 &1991108223 PrefabInstance: m_ObjectHideFlags: 0 @@ -411294,6 +411304,26 @@ PrefabInstance: propertyPath: m_barks.Array.data[87].barks.Array.size value: 1 objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[97].barks.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[98].barks.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[99].barks.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[100].barks.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} propertyPath: m_barks.Array.data[85].barks.Array.data[0].clip @@ -411309,6 +411339,56 @@ PrefabInstance: propertyPath: m_barks.Array.data[87].barks.Array.data[0].clip value: objectReference: {fileID: 8300000, guid: 8cf3f0f19f1cdf04ab53649fa114b233, type: 3} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[97].barks.Array.data[0].clip + value: + objectReference: {fileID: 8300000, guid: a9e8109797e4fab4b9a0057cc41c7b08, type: 3} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[97].barks.Array.data[1].clip + value: + objectReference: {fileID: 8300000, guid: f0b9bd74fc8aa0a45b70acec9aa41662, type: 3} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[97].barks.Array.data[2].clip + value: + objectReference: {fileID: 8300000, guid: 5ce5647e0d781924c9a979cb648fcf6b, type: 3} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[98].barks.Array.data[0].clip + value: + objectReference: {fileID: 8300000, guid: c424b0e821f4a964aae1be6e558ae6b9, type: 3} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[98].barks.Array.data[1].clip + value: + objectReference: {fileID: 8300000, guid: ea7f6d75de8159a4b9ad0d50578789b4, type: 3} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[98].barks.Array.data[2].clip + value: + objectReference: {fileID: 8300000, guid: cb11a9759398b57498208965afcd5a59, type: 3} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[99].barks.Array.data[0].clip + value: + objectReference: {fileID: 8300000, guid: ee6021da38b372240ba71da60ca73c7c, type: 3} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[99].barks.Array.data[1].clip + value: + objectReference: {fileID: 8300000, guid: fec2e22430248c94da23cb3bc7af830c, type: 3} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[99].barks.Array.data[2].clip + value: + objectReference: {fileID: 8300000, guid: 9060ae330cbf35e4fae58361cda259d1, type: 3} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[100].barks.Array.data[1].clip + value: + objectReference: {fileID: 8300000, guid: 98d68b74a3da7af4dac4c9b30efac365, type: 3} - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} propertyPath: m_barks.Array.data[102].barks.Array.data[0].clip @@ -411329,6 +411409,56 @@ PrefabInstance: propertyPath: m_barks.Array.data[87].barks.Array.data[0].barkConversation value: CH02/RUINEDTOWN/CH02_ruinedtown_vo_ruined_wonderer_01 objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[97].barks.Array.data[0].barkConversation + value: CH02/RUINEDTOWN/CH02_vo_lament1_beggar_01 + objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[97].barks.Array.data[1].barkConversation + value: CH02/RUINEDTOWN/CH02_vo_lament1_beggar_02 + objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[97].barks.Array.data[2].barkConversation + value: CH02/RUINEDTOWN/CH02_vo_lament1_beggar_03 + objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[98].barks.Array.data[0].barkConversation + value: CH02/RUINEDTOWN/CH02_vo_lament2_beggar_01 + objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[98].barks.Array.data[1].barkConversation + value: CH02/RUINEDTOWN/CH02_vo_lament2_beggar_02 + objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[98].barks.Array.data[2].barkConversation + value: CH02/RUINEDTOWN/CH02_vo_lament2_beggar_03 + objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[99].barks.Array.data[0].barkConversation + value: CH02/RUINEDTOWN/CH02_vo_lament3_beggar_01 + objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[99].barks.Array.data[1].barkConversation + value: CH02/RUINEDTOWN/CH02_vo_lament3_beggar_02 + objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[99].barks.Array.data[2].barkConversation + value: CH02/RUINEDTOWN/CH02_vo_lament3_beggar_03 + objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[100].barks.Array.data[1].barkConversation + value: CH01/WASTELAND/CH01_wasteland_vo_soil_wanderer_01 + objectReference: {fileID: 0} - target: {fileID: 5532578592629425599, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} propertyPath: m_Name @@ -439030,7 +439160,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 897310239} + - {fileID: 771685080} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -439123,7 +439253,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 1074764986} + overrideMaterial: {fileID: 934523553} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 diff --git a/Assets/Scenes/Old_Levels!/TestHub.unity b/Assets/Scenes/Old_Levels!/TestHub.unity index df7e1f627..93c1fdeb1 100644 --- a/Assets/Scenes/Old_Levels!/TestHub.unity +++ b/Assets/Scenes/Old_Levels!/TestHub.unity @@ -13676,42 +13676,42 @@ PrefabInstance: - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -135 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210.00003 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -45 objectReference: {fileID: 0} - target: {fileID: 763034042805173548, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -14552,22 +14552,22 @@ PrefabInstance: - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -225 objectReference: {fileID: 0} - target: {fileID: 4310148345887150382, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -14732,22 +14732,22 @@ PrefabInstance: - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -315 objectReference: {fileID: 0} - target: {fileID: 4907318199456855652, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -15874,11 +15874,6 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} - - target: {fileID: 5935883484735210940, guid: 851e8e61247888340bdec90fc8aa37f5, - type: 3} - propertyPath: hideWeaponsTimer - value: 10 - objectReference: {fileID: 0} - target: {fileID: 5935883485110830931, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_IsActive @@ -16102,22 +16097,22 @@ PrefabInstance: - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -405 objectReference: {fileID: 0} - target: {fileID: 7534046934194550914, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} diff --git a/Assets/Scripts/Save/ConditionalEventTrigger.cs b/Assets/Scripts/Save/ConditionalEventTrigger.cs new file mode 100644 index 000000000..2b1159afd --- /dev/null +++ b/Assets/Scripts/Save/ConditionalEventTrigger.cs @@ -0,0 +1,89 @@ +// ConditionalEventTrigger.cs +using UnityEngine; +using UnityEngine.Events; +using PixelCrushers.DialogueSystem; +using PixelCrushers; + +namespace Beyond +{ + /// + /// A generic, saveable trigger that checks a Lua condition on start or load, + /// and fires a UnityEvent based on the result. + /// + [AddComponentMenu("Pixel Crushers/Dialogue System/Trigger/Conditional Event Trigger")] + public class ConditionalEventTrigger : Saver + { + [Header("Condition")] + [Tooltip("The Lua condition to check.")] + public Condition condition = new Condition(); + + [Tooltip("If ticked, the events will only be fired the first time the condition is met. This state is saved and loaded.")] + public bool fireOnce = true; + + [Header("Events")] + [Tooltip("Actions to perform if the condition is true.")] + public UnityEvent onConditionTrue; + + [Tooltip("Actions to perform if the condition is false.")] + public UnityEvent onConditionFalse; + + // This field is used by the custom editor for the Lua wizard. + [HideInInspector] + public DialogueDatabase selectedDatabase = null; + + private bool hasFired = false; + + /// + /// On game start, check the condition. Handles new games or scene loads. + /// + public override void Start() + { + base.Start(); + CheckConditionAndExecute(); + } + + /// + /// Called by the Save System when saving a game. Records if this trigger has already fired. + /// + public override string RecordData() + { + return SaveSystem.Serialize(hasFired); + } + + /// + /// Called by the Save System when loading a game. Restores the fired state + /// and then re-evaluates the condition. + /// + public override void ApplyData(string s) + { + hasFired = !string.IsNullOrEmpty(s) ? SaveSystem.Deserialize(s) : false; + CheckConditionAndExecute(); + } + + /// + /// Evaluates the Lua condition and invokes the appropriate UnityEvent. + /// + public void CheckConditionAndExecute() + { + if (fireOnce && hasFired) + { + if (DialogueDebug.logInfo) Debug.Log($"Dialogue System: ConditionalEventTrigger '{name}' will not fire again because Fire Once is true and it has already fired.", this); + return; + } + + bool conditionResult = condition.IsTrue(null); + + if (DialogueDebug.logInfo) Debug.Log($"Dialogue System: ConditionalEventTrigger '{name}' condition is {conditionResult}. Invoking events.", this); + + if (conditionResult) + { + onConditionTrue.Invoke(); + hasFired = true; // Mark as fired if the condition was met + } + else + { + onConditionFalse.Invoke(); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Save/ConditionalEventTrigger.cs.meta b/Assets/Scripts/Save/ConditionalEventTrigger.cs.meta new file mode 100644 index 000000000..2f3e2cc4e --- /dev/null +++ b/Assets/Scripts/Save/ConditionalEventTrigger.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6709a146e599d4c46882e1173a52b192 \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 09474655c..8b7be5468 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -86,6 +86,7 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 1 submitAnalytics: 1