From 1e80a44f7ab10487a93528f6fc7dbf8712b6b68d Mon Sep 17 00:00:00 2001 From: marcin Date: Fri, 17 Oct 2025 12:28:06 +0200 Subject: [PATCH] More dialogue improvements, barks stop on dialogue now --- .../iOS/addressables_content_state.bin | Bin 2517 -> 2517 bytes .../TestDialogueBase (Auto-Backup).asset | 21 +- .../TestDialogueBase (Auto-Backup).asset.meta | 2 +- Assets/Dialogue/TestDialogueBase.asset | 189 +- .../Scenes/02_Ruined_Town/Ruined_Town.unity | 2069 +++++++++++------ .../Scripts/Save/ConditionalEventTrigger.cs | 6 +- Assets/Scripts/Utils/BarkManager.cs | 81 + 7 files changed, 1589 insertions(+), 779 deletions(-) diff --git a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin index 1531a70f8d9727497640b42537ff13cda64f3dc2..23f04aa815b198e12807d58228ee9f18111887eb 100644 GIT binary patch delta 61 zcmV-D0K)&(6V(&2kO2cYW-_yr0igv1hQ|_NlQ;**1o0H$OOpc#h6Ka=PzjTb2zms- TA(Bj!3kiAzUjLvelZgpT#8Vc- delta 61 zcmV-D0K)&(6V(&2kO2cWW-+sq0igv1Z#CS-lQ;**1e|S8xRV12h6HZFMSYWv2zmr{ T&mqQ>3kiAzu*@$&lZgpT({C3q diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset index 17877c76e..1039f98ea 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset @@ -905,6 +905,20 @@ MonoBehaviour: value: type: 0 typeString: CustomFieldType_Text + - id: 21 + fields: + - title: Name + value: CH02SpiderBossKilled + type: 0 + typeString: CustomFieldType_Text + - title: Initial Value + value: False + type: 2 + typeString: CustomFieldType_Boolean + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text conversations: - id: 1 fields: @@ -24562,7 +24576,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Herbalist/Q3_Beggar_n_4) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24583,7 +24597,8 @@ MonoBehaviour: destinationDialogueID: 8 isConnector: 0 priority: 2 - conditionsString: Variable["CH02HerbalistSpoke"] == true + conditionsString: Variable["CH02HerbalistSpoke"] == true and (Variable["CH02SpiderBossKilled"] + == false) userScript: onExecute: m_PersistentCalls: @@ -24638,7 +24653,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Herbalist/Q3_Beggar_n_5) type: 0 typeString: CustomFieldType_Text - title: pl diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta index 61d7b5e0f..628234724 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c84b775d4f6240b185527d49e09404f +guid: bc7b4d42ce9b640aba413f92d69211b6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Dialogue/TestDialogueBase.asset b/Assets/Dialogue/TestDialogueBase.asset index 6c1caadf1..1f0f6b28d 100644 --- a/Assets/Dialogue/TestDialogueBase.asset +++ b/Assets/Dialogue/TestDialogueBase.asset @@ -905,6 +905,20 @@ MonoBehaviour: value: type: 0 typeString: CustomFieldType_Text + - id: 21 + fields: + - title: Name + value: CH02SpiderBossKilled + type: 0 + typeString: CustomFieldType_Text + - title: Initial Value + value: False + type: 2 + typeString: CustomFieldType_Boolean + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text conversations: - id: 1 fields: @@ -24067,7 +24081,7 @@ MonoBehaviour: - title: Title value: START type: 0 - typeString: + typeString: CustomFieldType_Text - title: Pictures value: '[]' type: 3 @@ -24075,7 +24089,7 @@ MonoBehaviour: - title: Description value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Actor value: 1 type: 5 @@ -24087,15 +24101,15 @@ MonoBehaviour: - title: Menu Text value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Dialogue Text value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Parenthetical value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Audio Files value: '[]' type: 3 @@ -24103,11 +24117,11 @@ MonoBehaviour: - title: Video File value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Sequence value: None() type: 0 - typeString: + typeString: CustomFieldType_Text - title: pl value: type: 4 @@ -24132,6 +24146,12 @@ MonoBehaviour: destinationDialogueID: 10 isConnector: 0 priority: 2 + - originConversationID: 96 + originDialogueID: 0 + destinationConversationID: 96 + destinationDialogueID: 11 + isConnector: 0 + priority: 2 conditionsString: userScript: onExecute: @@ -24562,7 +24582,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Herbalist/Q3_Beggar_n_4) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24583,7 +24603,8 @@ MonoBehaviour: destinationDialogueID: 8 isConnector: 0 priority: 2 - conditionsString: Variable["CH02HerbalistSpoke"] == true + conditionsString: Variable["CH02HerbalistSpoke"] == true and (Variable["CH02SpiderBossKilled"] + == false) userScript: onExecute: m_PersistentCalls: @@ -24638,7 +24659,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Herbalist/Q3_Beggar_n_5) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24713,7 +24734,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: Audio(Dialogues/VO/CH02/Beggar/CH02_vo_herbalist_wanderer_03) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24815,6 +24836,152 @@ MonoBehaviour: y: 101 width: 160 height: 30 + - id: 11 + 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: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: The spider crone is dead... After all these years of terror... Alas, + her brood survives, and soon another shall take her place. + 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/On_Spider_Boss/Q3_Beggar_n_6) + 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: 11 + destinationConversationID: 96 + destinationDialogueID: 12 + isConnector: 0 + priority: 2 + conditionsString: Variable["CH02SpiderBossKilled"] == true + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 478 + y: 71 + width: 160 + height: 30 + - id: 12 + 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: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: And her poison still defiles the river. Nothing ever changes. This + land is beyond hope. + 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/On_Spider_Boss/Q3_Beggar_n_7) + 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: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 478 + y: 121 + 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 8774b5b89..2e716a5b0 100644 --- a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity +++ b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity @@ -5781,7 +5781,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1652919104} + objectReference: {fileID: 1108983342} - target: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Name @@ -29588,6 +29588,171 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 196864724} m_Mesh: {fileID: -2747707763487863864, guid: 160f0655a5466da4dab9b951199da54e, type: 3} +--- !u!43 &196933056 +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!1 &197354507 GameObject: m_ObjectHideFlags: 0 @@ -46325,6 +46490,27 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 6512215053017429888, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: MaxDistance + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 6512215053017429888, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: MinDistance + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 6512215053017429888, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 385000820370598951, guid: 5dd761199ee4b7045a10fd9b79e36026, + type: 2} + - target: {fileID: 6512215053017429888, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: spreadCustomCurve.m_Curve.Array.data[0].value + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, type: 3} propertyPath: m_Enabled @@ -46377,7 +46563,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 320848345} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1087288915} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 82f8f534f4d73499ea554681a3e99a4a, type: 3} @@ -47783,6 +47969,18 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3ef32dcb7e900c245b48572d43b140b4, type: 3} +--- !u!1 &341440045 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + m_PrefabInstance: {fileID: 1543425059} + m_PrefabAsset: {fileID: 0} +--- !u!4 &341440046 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + m_PrefabInstance: {fileID: 1543425059} + m_PrefabAsset: {fileID: 0} --- !u!1001 &342106202 PrefabInstance: m_ObjectHideFlags: 0 @@ -50662,6 +50860,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 362661433} m_PrefabAsset: {fileID: 0} +--- !u!43 &363703263 +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!4 &363731423 stripped Transform: m_CorrespondingSourceObject: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, @@ -125016,39 +125379,6 @@ 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 @@ -127115,171 +127445,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 791567355} m_PrefabAsset: {fileID: 0} ---- !u!43 &791755172 -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 &791988278 PrefabInstance: m_ObjectHideFlags: 0 @@ -146111,70 +146276,6 @@ 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 @@ -165746,6 +165847,150 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f00a42f926f91b744b4f2658f1c884b9, type: 3} +--- !u!1001 &1078730711 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1099537664} + m_Modifications: + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalScale.x + value: 11.968117 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalScale.y + value: 11.968117 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalScale.z + value: 11.968117 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalPosition.x + value: -152.88 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.13399887 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalPosition.z + value: 329.73 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2065518434898640957, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Name + value: Bark_lament_beggar_witch + objectReference: {fileID: 0} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Layer + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6512215053017429888, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 385000820370598951, guid: 5dd761199ee4b7045a10fd9b79e36026, + type: 2} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + 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 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: 'barkManagerEntryIndices.Array.data[0]' + value: 96 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: 'barkManagerEntryIndices.Array.data[1]' + value: 98 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: 'barkManagerEntryIndices.Array.data[2]' + value: 99 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 328b55d817523634f85d1e8a144d9dd4, type: 3} --- !u!1001 &1078908160 PrefabInstance: m_ObjectHideFlags: 0 @@ -166407,6 +166652,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0b3e1f0239d23ce439870753c33af406, type: 3} +--- !u!1 &1087288915 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + m_PrefabInstance: {fileID: 320848345} + m_PrefabAsset: {fileID: 0} --- !u!4 &1087962447 stripped Transform: m_CorrespondingSourceObject: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, @@ -168287,7 +168538,10 @@ Transform: - {fileID: 77641632} - {fileID: 143530224} - {fileID: 956719168} + - {fileID: 1410170353} - {fileID: 320848346} + - {fileID: 2042575153} + - {fileID: 341440046} - {fileID: 1608354591} - {fileID: 1373640430} - {fileID: 1356411111} @@ -169009,6 +169263,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 493aa7eba03489345b4b1ed9a2a9cc51, type: 3} +--- !u!43 &1108983342 +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!1 &1109238395 GameObject: m_ObjectHideFlags: 0 @@ -169672,6 +170091,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1113957296} m_PrefabAsset: {fileID: 0} +--- !u!43 &1114738121 +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 &1115463739 PrefabInstance: m_ObjectHideFlags: 0 @@ -198063,6 +198647,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1333904854} m_PrefabAsset: {fileID: 0} +--- !u!21 &1335909382 +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!4 &1335978723 stripped Transform: m_CorrespondingSourceObject: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, @@ -207425,6 +208042,179 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1408508752} m_Mesh: {fileID: 1580507954859102490, guid: e574c732e655792458c8e99df81aa5b9, type: 3} +--- !u!1 &1410170352 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1410170353} + - component: {fileID: 1410170355} + - component: {fileID: 1410170354} + m_Layer: 0 + m_Name: Lament Coditional Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1410170353 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410170352} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1099537664} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1410170354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410170352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6709a146e599d4c46882e1173a52b192, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: Lament2 + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + condition: + luaConditions: + - Variable["CH02HerbalistSpoke"] == true + - Variable["CH02SpiderBossKilled"] == true + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + fireOnce: 1 + onConditionTrue: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1087288915} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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: 2042575152} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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: 341440045} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + onConditionFalse: + m_PersistentCalls: + m_Calls: [] + selectedDatabase: {fileID: 0} + CheckInterval: 1 +--- !u!114 &1410170355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410170352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6709a146e599d4c46882e1173a52b192, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: Lament1 + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + condition: + luaConditions: + - Variable["CH02HerbalistSpoke"] == true + - Variable["CH02SpiderBossKilled"] == false + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + fireOnce: 1 + onConditionTrue: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1087288915} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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: 2042575152} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 341440045} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 + onConditionFalse: + m_PersistentCalls: + m_Calls: [] + selectedDatabase: {fileID: 0} + CheckInterval: 1 --- !u!1 &1410678329 GameObject: m_ObjectHideFlags: 0 @@ -225003,6 +225793,150 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1543159403} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1543425059 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1099537664} + m_Modifications: + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalScale.x + value: 11.968117 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalScale.y + value: 11.968117 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalScale.z + value: 11.968117 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalPosition.x + value: -152.88 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.13399887 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalPosition.z + value: 329.73 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2065518434898640957, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Name + value: Bark_lament_beggar_spider + objectReference: {fileID: 0} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Layer + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6512215053017429888, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 385000820370598951, guid: 5dd761199ee4b7045a10fd9b79e36026, + type: 2} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + 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 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: 'barkManagerEntryIndices.Array.data[0]' + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: 'barkManagerEntryIndices.Array.data[1]' + value: 99 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: 'barkManagerEntryIndices.Array.data[2]' + value: 99 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 328b55d817523634f85d1e8a144d9dd4, type: 3} --- !u!1001 &1543854356 PrefabInstance: m_ObjectHideFlags: 0 @@ -239682,171 +240616,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1652905887} m_PrefabAsset: {fileID: 0} ---- !u!43 &1652919104 -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 &1652933643 PrefabInstance: m_ObjectHideFlags: 0 @@ -246338,171 +247107,6 @@ 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 @@ -316021,7 +316625,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 791755172} + objectReference: {fileID: 363703263} - target: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Name @@ -344047,6 +344651,70 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1881806673} m_PrefabAsset: {fileID: 0} +--- !u!21 &1987214584 +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 &1987395085 PrefabInstance: m_ObjectHideFlags: 0 @@ -344448,171 +345116,6 @@ 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 @@ -353340,6 +353843,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2042439798} m_PrefabAsset: {fileID: 0} +--- !u!1 &2042575152 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + m_PrefabInstance: {fileID: 1078730711} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2042575153 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + m_PrefabInstance: {fileID: 1078730711} + m_PrefabAsset: {fileID: 0} --- !u!1 &2042870241 GameObject: m_ObjectHideFlags: 0 @@ -411289,6 +411804,24 @@ PrefabInstance: value: objectReference: {fileID: 7461429802988689633, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[97].customOutput + value: + objectReference: {fileID: 385000820370598951, guid: 5dd761199ee4b7045a10fd9b79e36026, + type: 2} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[98].customOutput + value: + objectReference: {fileID: 385000820370598951, guid: 5dd761199ee4b7045a10fd9b79e36026, + type: 2} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[99].customOutput + value: + objectReference: {fileID: 385000820370598951, guid: 5dd761199ee4b7045a10fd9b79e36026, + type: 2} - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} propertyPath: m_barks.Array.data[85].barks.Array.size @@ -411304,6 +411837,11 @@ 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[96].barks.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} propertyPath: m_barks.Array.data[97].barks.Array.size @@ -411317,7 +411855,7 @@ PrefabInstance: - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} propertyPath: m_barks.Array.data[99].barks.Array.size - value: 3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} @@ -411464,6 +412002,11 @@ PrefabInstance: propertyPath: m_Name value: BARKS objectReference: {fileID: 0} + - target: {fileID: 5532578592629425599, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -439160,7 +439703,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 771685080} + - {fileID: 1335909382} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -439253,7 +439796,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 934523553} + overrideMaterial: {fileID: 1987214584} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 diff --git a/Assets/Scripts/Save/ConditionalEventTrigger.cs b/Assets/Scripts/Save/ConditionalEventTrigger.cs index 2b1159afd..3406657eb 100644 --- a/Assets/Scripts/Save/ConditionalEventTrigger.cs +++ b/Assets/Scripts/Save/ConditionalEventTrigger.cs @@ -23,13 +23,15 @@ namespace Beyond [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; + [Tooltip("How often to check the condition (in seconds). If zero, only checks on start/load.")] + public float CheckInterval = 1.0f; private bool hasFired = false; @@ -40,6 +42,8 @@ namespace Beyond { base.Start(); CheckConditionAndExecute(); + if (CheckInterval > 0) + InvokeRepeating("CheckConditionAndExecute", CheckInterval + (Random.value * CheckInterval), CheckInterval); } /// diff --git a/Assets/Scripts/Utils/BarkManager.cs b/Assets/Scripts/Utils/BarkManager.cs index ad327b961..5514b6cf2 100644 --- a/Assets/Scripts/Utils/BarkManager.cs +++ b/Assets/Scripts/Utils/BarkManager.cs @@ -70,6 +70,9 @@ namespace Beyond // Ensure this namespace matches your project structure public bool IsPlaying => m_audioSource != null && m_audioSource.isPlaying; + // --- NEW: Flag to control bark playback --- + private bool m_isPaused = false; + // --- Core Methods --- public override void Awake() @@ -93,6 +96,29 @@ namespace Beyond // Ensure this namespace matches your project structure SetupAudioSource(); InitializeSaveData(); BuildConversationLookup(); + + } + + // --- NEW: Subscribe to Dialogue System events --- + private void OnEnable() + { + var dialogueSystemEvents = DialogueManager.instance.GetComponent(); + if (dialogueSystemEvents != null) + { + dialogueSystemEvents.conversationEvents.onConversationStart.AddListener(OnConversationStart); + dialogueSystemEvents.conversationEvents.onConversationEnd.AddListener(OnConversationEnd); + } + } + + // --- NEW: Unsubscribe from Dialogue System events --- + private void OnDisable() + { + var dialogueSystemEvents = DialogueManager.instance.GetComponent(); + if (dialogueSystemEvents != null) + { + dialogueSystemEvents.conversationEvents.onConversationStart.RemoveListener(OnConversationStart); + dialogueSystemEvents.conversationEvents.onConversationEnd.RemoveListener(OnConversationEnd); + } } private void SetupAudioSource() @@ -152,6 +178,9 @@ namespace Beyond // Ensure this namespace matches your project structure /// The AudioClip that will be played (or null if none/delayed). public AudioClip PlayBark(int entryIndex, Transform barkTarget = null, int specificBarkIndex = -1) { + // --- MODIFIED: Check if barks are paused --- + if (m_isPaused) return null; + if (entryIndex < 0 || entryIndex >= m_barks.Length) { Debug.LogError($"BarkManager: Invalid entryIndex {entryIndex}.", this); @@ -223,6 +252,9 @@ namespace Beyond // Ensure this namespace matches your project structure /// public void PlayBark(string conversation, Transform barkTarget = null) { + // --- MODIFIED: Check if barks are paused --- + if (m_isPaused) return; + if (m_conversationToEntry.TryGetValue(conversation, out int entryIndex)) { // Determine target *before* queuing, store null if Player isn't available/needed @@ -248,6 +280,9 @@ namespace Beyond // Ensure this namespace matches your project structure /// public void PlayBarkFromQueue(int entryIndex, Transform barkTarget = null) { + // --- MODIFIED: Check if barks are paused --- + if (m_isPaused) return; + // Queue the original target (null if default intended). Update loop will resolve Player.Instance if needed. m_barkQueue.Enqueue(new QueuedBarkRequest { entryIndex = entryIndex, target = barkTarget }); } @@ -267,6 +302,9 @@ namespace Beyond // Ensure this namespace matches your project structure /// private AudioClip PlayBarkImmediately(BarkEntry barkEntry, Transform targetForText, int specificBarkIndex = -1) { + // --- MODIFIED: Check if barks are paused --- + if (m_isPaused) return null; + if (barkEntry.barks == null || barkEntry.barks.Length == 0) return null; Bark barkToPlay = null; @@ -361,6 +399,9 @@ namespace Beyond // Ensure this namespace matches your project structure private void Update() { + // --- MODIFIED: Check if barks are paused --- + if (m_isPaused) return; + // Process the queue for externally triggered RANDOM barks if (m_barkQueue.Count > 0 && !IsPlaying) { @@ -382,5 +423,45 @@ namespace Beyond // Ensure this namespace matches your project structure PlayBark(request.entryIndex, targetForText, -1); } } + + // --- NEW: Event handlers for conversation start and end --- + private void OnConversationStart(Transform actor) + { + //PauseBarks(); + StopBarks(); + } + + private void OnConversationEnd(Transform actor) + { + //ResumeBarks(); + } + + // --- NEW: Public methods to pause and resume barks --- + public void StopBarks() + { + if (m_audioSource != null && m_audioSource.isPlaying) + { + m_audioSource.Stop(); + } + m_barkQueue.Clear(); // Clear any pending barks + } + public void PauseBarks() + { + m_isPaused = true; + if (m_audioSource != null && m_audioSource.isPlaying) + { + m_audioSource.Pause(); + } + m_barkQueue.Clear(); // Clear any pending barks + } + + public void ResumeBarks() + { + m_isPaused = false; + if (m_audioSource != null) + { + m_audioSource.UnPause(); + } + } } } \ No newline at end of file