diff --git a/Assets/Dialogue/TestDialogueBase.asset b/Assets/Dialogue/TestDialogueBase.asset index 2d17be767..0df8aa779 100644 --- a/Assets/Dialogue/TestDialogueBase.asset +++ b/Assets/Dialogue/TestDialogueBase.asset @@ -9524,7 +9524,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: AudioWait(Dialogues/VO/CH01/CH01_wasteland_vo_opening_wanderer_01) + value: type: 0 typeString: CustomFieldType_Text - title: pl @@ -9550,7 +9550,7 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 + x: 19 y: 80 width: 160 height: 30 @@ -15983,6 +15983,394 @@ MonoBehaviour: height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 + - id: 56 + fields: + - title: Title + value: Barks/Combat/InsectsLargerThanVultures + 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 + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: + - 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: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Parenthetical + value: + type: 0 + typeString: + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 56 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 56 + originDialogueID: 0 + destinationConversationID: 56 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 21 + y: 30 + width: 160 + height: 30 + - id: 1 + 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: Insects larger than vultures! And with a bite to match! + 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: 56 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 21 + y: 80 + width: 160 + height: 30 + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 1 + - id: 57 + fields: + - title: Title + value: Barks/Misc/WoodenBoxes + 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 + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: + - 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: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Parenthetical + value: + type: 0 + typeString: + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 57 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: + conditionPriority: 2 + outgoingLinks: + - originConversationID: 57 + originDialogueID: 0 + destinationConversationID: 57 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 30 + width: 160 + height: 30 + - id: 1 + 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: Wooden Boxes! + 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: 57 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 80 + width: 160 + height: 30 + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 1 syncInfo: syncActors: 0 syncItems: 0 diff --git a/Assets/Meshes/Terrain/Terrain_Land01.asset b/Assets/Meshes/Terrain/Terrain_Land01.asset index 9382b9d78..79744282f 100644 Binary files a/Assets/Meshes/Terrain/Terrain_Land01.asset and b/Assets/Meshes/Terrain/Terrain_Land01.asset differ diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Wrappers/Triggers/Trigger/DialogueSystemTrigger.cs b/Assets/Plugins/Pixel Crushers/Dialogue System/Wrappers/Triggers/Trigger/DialogueSystemTrigger.cs index f3267149d..b9f6072c4 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Wrappers/Triggers/Trigger/DialogueSystemTrigger.cs +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Wrappers/Triggers/Trigger/DialogueSystemTrigger.cs @@ -1,5 +1,6 @@ // Copyright (c) Pixel Crushers. All rights reserved. +using UnityEditor.Localization.Platform.iOS; using UnityEngine; namespace PixelCrushers.DialogueSystem.Wrappers @@ -13,6 +14,7 @@ namespace PixelCrushers.DialogueSystem.Wrappers [AddComponentMenu("Pixel Crushers/Dialogue System/Trigger/Dialogue System Trigger")] public class DialogueSystemTrigger : PixelCrushers.DialogueSystem.DialogueSystemTrigger { + } } diff --git a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity index 81a3010c9..c4a9f6d9c 100644 --- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity +++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity @@ -17837,317 +17837,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1001 &41760670 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 132977598} - m_Modifications: - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: selectedToolbar - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: items.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: items.Array.data[0].id - value: 37 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: items.Array.data[1].id - value: 37 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: items.Array.data[1].amount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: items.Array.data[0].autoEquip - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: items.Array.data[0].indexArea - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: items.Array.data[1].autoEquip - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: items.Array.data[1].indexArea - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: items.Array.data[0].addToEquipArea - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: items.Array.data[1].addToEquipArea - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.size - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1565036105} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 132977599} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: - objectReference: {fileID: 476689743} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: - objectReference: {fileID: 476689746} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SendToMessageSystem - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: StartSequence - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName - value: SetActive - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName - value: set_enabled - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OnCollect - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: PixelCrushers.QuestMachine.QuestControl, Assembly-CSharp-firstpass - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: Beyond.EventSequencer, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName - value: UnityEngine.Behaviour, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_BoolArgument - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: Grotto:Searched - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Beyond.StreamedResource, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 4747826755034805080, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalScale.x - value: 3.5219667 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalScale.y - value: 3.5219667 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalScale.z - value: 3.5219667 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalPosition.x - value: 173.449 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalPosition.y - value: -2.5 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalPosition.z - value: 115.008 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.28771275 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.28771275 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.6459268 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.6459268 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -131.981 - objectReference: {fileID: 0} - - target: {fileID: 8806270027713585514, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_Name - value: ScrollCovertGaze (1) - objectReference: {fileID: 0} - - target: {fileID: 8806270027713585514, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1314673666} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 8806270027713585514, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1331572458} - m_SourcePrefab: {fileID: 100100000, guid: edacd90c61ae041e0a75c4474d1061bc, type: 3} --- !u!1001 &42607551 PrefabInstance: m_ObjectHideFlags: 0 @@ -21083,7 +20772,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: -1 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -28539,7 +28228,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: 0 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -33278,7 +32967,7 @@ MonoBehaviour: m_onDelay: 0 m_useOnce: 1 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -41262,7 +40951,6 @@ Transform: - {fileID: 1882198780} - {fileID: 339154568323727960} - {fileID: 1054165732} - - {fileID: 1331572457} - {fileID: 1485264658} - {fileID: 643769026} m_Father: {fileID: 1565036104} @@ -41805,7 +41493,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: 0 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -47991,7 +47679,7 @@ MonoBehaviour: m_onDelay: 0 m_useOnce: 1 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -67975,39 +67663,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fe91b44cb15078e40bcfe633f6eb1a24, type: 3} ---- !u!21 &250708401 -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 &251507380 PrefabInstance: m_ObjectHideFlags: 0 @@ -76012,7 +75667,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: 0 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -110926,7 +110581,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 918936645} + objectReference: {fileID: 893412158} - target: {fileID: 2614899761469592907, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -118867,7 +118522,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: 0 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -131274,7 +130929,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1305140811} + objectReference: {fileID: 1560065398} - target: {fileID: 2614899761469592907, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -144322,7 +143977,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: 0 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -195369,7 +195024,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: 0 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -203288,6 +202943,8 @@ GameObject: - component: {fileID: 759746026} - component: {fileID: 759746025} - component: {fileID: 759746024} + - component: {fileID: 759746028} + - component: {fileID: 759746027} m_Layer: 11 m_Name: CH01_wasteland_vo_opening_wanderer_01 m_TagString: Untagged @@ -203317,7 +202974,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 759746021} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} m_Name: @@ -203408,6 +203065,134 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 759746021} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &759746027 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759746021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3ee7654fb1dcff41b62c9ccb5f3111f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + m_fireOnce: 1 + m_wasFired: 0 + m_objectsToEnable: [] + m_objectsToDisable: [] + m_fireOnStart: 0 + m_triggersToFire: [] + m_delay: -1 + m_actionResponse: + barkConversation: CH01/WASTELAND/CH01_wasteland_vo_opening_wanderer_01 + audioClip: {fileID: 0} + responseEvent: + m_PersistentCalls: + m_Calls: [] + delay: 0 + m_materialsToChange: [] +--- !u!82 &759746028 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759746021} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &760317580 PrefabInstance: m_ObjectHideFlags: 0 @@ -216690,7 +216475,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: 0 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -220401,7 +220186,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: -1 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -237312,6 +237097,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} +--- !u!43 &893412158 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &893826292 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5347464428523272410, guid: 003daaab58a32ca419f0a3ef3dbef864, @@ -241676,171 +241626,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c25cd2eb3b4754a4a8a501237afa65b0, type: 3} ---- !u!43 &918936645 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &918955919 PrefabInstance: m_ObjectHideFlags: 0 @@ -261170,171 +260955,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 981638066} m_PrefabAsset: {fileID: 0} ---- !u!43 &981947722 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &982266373 PrefabInstance: m_ObjectHideFlags: 0 @@ -269509,7 +269129,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: 0 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -269827,7 +269447,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: 2 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -305317,7 +304937,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: -1 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -305672,152 +305292,193 @@ MonoBehaviour: - playOnce: 1 delayToStart: 0 barks: - - barkText: Wooden Boxes! + - barkConversation: Barks/Misc/WoodenBoxes + barkText: Wooden Boxes! clip: {fileID: 8300000, guid: ceb4ee07aa470e64dad9677e167903f0, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: Now, to find that camp of Giants + - barkConversation: + barkText: Now, to find that camp of Giants clip: {fileID: 8300000, guid: be5db2e30f68cc140af1bcce1cd9e086, type: 3} - playOnce: 0 delayToStart: 0 barks: - - barkText: Insects larger than vultures! And with a bite to match! + - barkConversation: Barks/Combat/InsectsLargerThanVultures + barkText: Insects larger than vultures! And with a bite to match! clip: {fileID: 8300000, guid: a70ffdd59d271a94984215a2b402ac8e, type: 3} - - barkText: Take your venom to the grave! + - barkConversation: + barkText: Take your venom to the grave! clip: {fileID: 8300000, guid: 84ac99c82b5d394409a79e34e33ea2b4, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: "Looks like that\u2019s the last of the beasts. This place could + - barkConversation: + barkText: "Looks like that\u2019s the last of the beasts. This place could use some restoration. Think I\u2019ll plant some trees" clip: {fileID: 8300000, guid: f505477fa1e15fe41a58190df98b2c02, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: "This place could use some restoration. Think I\u2019ll plant some + - barkConversation: + barkText: "This place could use some restoration. Think I\u2019ll plant some trees" clip: {fileID: 8300000, guid: 6eddb1c3105f9b94fa0d84a4b93ab1a9, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: Die! + - barkConversation: + barkText: Die! clip: {fileID: 8300000, guid: 8b57cdbdc26c0ff4687a14aa72ab330d, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: I sense dark magic here. I must prepare. + - barkConversation: + barkText: I sense dark magic here. I must prepare. clip: {fileID: 8300000, guid: e2fd7c61fdd386f42af04f02813e8820, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: Perfect place to plant a Justice Tree + - barkConversation: + barkText: Perfect place to plant a Justice Tree clip: {fileID: 8300000, guid: b0e5b4e9aa5f4bf42a1c7739dd517d94, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: "Hmm. Sick trees\u2026. Well\u2026 I\u2019ll heal them" + - barkConversation: + barkText: "Hmm. Sick trees\u2026. Well\u2026 I\u2019ll heal them" clip: {fileID: 8300000, guid: 6ad1b2e774875234db68998a58cd4b1f, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: That was some good restoration work. The land can do the rest + - barkConversation: + barkText: That was some good restoration work. The land can do the rest clip: {fileID: 8300000, guid: 848c49f98e108af4bb3f98d508a6f31f, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: "Now, to the Gate\u2019s lock mechanism" + - barkConversation: + barkText: "Now, to the Gate\u2019s lock mechanism" clip: {fileID: 8300000, guid: 247220715184e1c41809571bf34c13b2, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: Now. Soak up this light to help you grow + - barkConversation: + barkText: Now. Soak up this light to help you grow clip: {fileID: 8300000, guid: 45ddafb8f2a53834ea084138dfcc882e, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: "Hang on minute! A hidden cave! Perhaps there\u2019s treasure! " + - barkConversation: + barkText: "Hang on minute! A hidden cave! Perhaps there\u2019s treasure! " clip: {fileID: 8300000, guid: cc49ae52003105841b0a388802bff493, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: A Power Scroll! Always need one of them! + - barkConversation: + barkText: A Power Scroll! Always need one of them! clip: {fileID: 8300000, guid: 33023c029d6c36646affaa210ef022e1, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: I knew there was more treasure! + - barkConversation: + barkText: I knew there was more treasure! clip: {fileID: 8300000, guid: e4b583b02f85fba44bd7cfa376755250, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: Perfect + - barkConversation: + barkText: Perfect clip: {fileID: 8300000, guid: b82ee26185a400649a4b4ebae073420d, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: "A Shadow Slayer! Just when I need it! And the gemstones to charge + - barkConversation: + barkText: "A Shadow Slayer! Just when I need it! And the gemstones to charge it!... This is no coincidence\u2026. Vasiliean could have hidden it here!" clip: {fileID: 8300000, guid: 1e6f1ca1545d6cc4793d7ba89f8f55a3, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: More Shadow Soldiers. Best use Shadow Slayer and deal with them before + - barkConversation: + barkText: More Shadow Soldiers. Best use Shadow Slayer and deal with them before they call for reinforcements clip: {fileID: 8300000, guid: 7e274d0b6a1c87148b04725cf21b4fdd, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: 'Ha! To the corrupted the Power of Light is death! ' + - barkConversation: + barkText: 'Ha! To the corrupted the Power of Light is death! ' clip: {fileID: 8300000, guid: 7e0f417c73f8431499e55d6e0baefea5, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: "I\u2019ve got the hang of you now, Shadow Slayer!" + - barkConversation: + barkText: "I\u2019ve got the hang of you now, Shadow Slayer!" clip: {fileID: 8300000, guid: 0e9db870196ce99449f3416552c392e9, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: The portal to the Oasis Should be somewhere around here + - barkConversation: + barkText: The portal to the Oasis Should be somewhere around here clip: {fileID: 8300000, guid: d6367b60a18b2964ba25394c12276e18, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: Ah, yes, my gateway To safety. Magnificent as always. + - barkConversation: + barkText: Ah, yes, my gateway To safety. Magnificent as always. clip: {fileID: 8300000, guid: d7fd991ca06997a45843412ec97c8a9d, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: "Oh, that\u2019s right! To kill ghost enemies I need to use Shadow + - barkConversation: + barkText: "Oh, that\u2019s right! To kill ghost enemies I need to use Shadow Slayer!" clip: {fileID: 8300000, guid: d906c9698c3be6f46994e6a81a56b9c2, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: This weapon is Definitely not doing the job! Better bring out Shadow + - barkConversation: + barkText: This weapon is Definitely not doing the job! Better bring out Shadow Slayer clip: {fileID: 8300000, guid: 3704ae01ee95d3941901b522f50dc3af, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: Shadow Slayer! Work your magic! Do away with this evil! + - barkConversation: + barkText: Shadow Slayer! Work your magic! Do away with this evil! clip: {fileID: 8300000, guid: ccdd901d09e3f6f48b13cd0bd05a9a0b, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: "I\u2019d best check this out" + - barkConversation: + barkText: "I\u2019d best check this out" clip: {fileID: 8300000, guid: 8ad3d3a01f6f7ac48b436b703cff08a5, type: 3} - playOnce: 1 delayToStart: 0 barks: - - barkText: Much better + - barkConversation: + barkText: Much better clip: {fileID: 8300000, guid: b5ea25023368422498bfa1d1c505e5c4, type: 3} - playOnce: 1 delayToStart: 5 barks: - - barkText: "I\u2019ll be back for my treasures. Now it\u2019s time to get to + - barkConversation: + barkText: "I\u2019ll be back for my treasures. Now it\u2019s time to get to the gate. Find that camp of Giants and that Mystical Sword" clip: {fileID: 8300000, guid: fe6bad3bce531a24ab41bd6e15cc2e03, type: 3} + - playOnce: 1 + delayToStart: 0 + barks: + - barkConversation: CH01/WASTELAND/CH01_wasteland_vo_blocked_wanderer_01 + barkText: + clip: {fileID: 8300000, guid: f8c14a0f98191fb48a4e4477cc53fe71, type: 3} + - playOnce: 1 + delayToStart: 0 + barks: + - barkConversation: CH01/WASTELAND/CH01_wasteland_vo_opening_wanderer_01 + barkText: + clip: {fileID: 8300000, guid: 2b25d85f90e208940a73488c4797f7cf, type: 3} m_saveData: wasPlayed: m_audioSource: {fileID: 1141881518} @@ -320831,7 +320492,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: 0 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -334053,6 +333714,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1813325564} m_PrefabAsset: {fileID: 0} +--- !u!21 &1231945976 +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 &1232827722 PrefabInstance: m_ObjectHideFlags: 0 @@ -338168,171 +337862,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1254445378} m_PrefabAsset: {fileID: 0} ---- !u!43 &1254536033 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1254691434 PrefabInstance: m_ObjectHideFlags: 0 @@ -340965,6 +340494,70 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1267006268} m_PrefabAsset: {fileID: 0} +--- !u!21 &1268001914 +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 &1268619110 PrefabInstance: m_ObjectHideFlags: 0 @@ -347477,171 +347070,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1304670392} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!43 &1305140811 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1305579412 PrefabInstance: m_ObjectHideFlags: 0 @@ -348637,12 +348065,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1314445664} m_PrefabAsset: {fileID: 0} ---- !u!4 &1314673666 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - m_PrefabInstance: {fileID: 1593353210} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1314682534 PrefabInstance: m_ObjectHideFlags: 0 @@ -353292,37 +352714,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1330936342} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1331572456 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8806270027713585514, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - m_PrefabInstance: {fileID: 41760670} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1331572457 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8177964361830759376, guid: edacd90c61ae041e0a75c4474d1061bc, - type: 3} - m_PrefabInstance: {fileID: 41760670} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1331572458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1331572456} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03526e258566dc247a4eb8525aeeb667, type: 3} - m_Name: - m_EditorClassIdentifier: - m_key: ScrollCovertGaze_1478014 - m_appendSaverTypeToKey: 0 - m_saveAcrossSceneChanges: 0 - m_restoreStateOnStart: 0 - m_mode: 1 - m_destroyMode: 0 - m_destroyedVersionPrefab: {fileID: 0} --- !u!1001 &1332735765 PrefabInstance: m_ObjectHideFlags: 0 @@ -369715,7 +369106,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: 0 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -396843,7 +396234,7 @@ MonoBehaviour: m_onDelay: 0 m_useOnce: 1 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -408634,19 +408025,19 @@ MonoBehaviour: m_fireOnce: 1 m_wasFired: 0 m_correctResponses: - - barkText: Finally some good luck! + - barkConversation: audioClip: {fileID: 8300000, guid: cd06a09bb9823884eb68dfab096bb4c4, type: 3} responseEvent: m_PersistentCalls: m_Calls: [] delay: 1.2 - - barkText: You must be next + - barkConversation: audioClip: {fileID: 8300000, guid: 757e76c67e8d1794f8ffd511226b3975, type: 3} responseEvent: m_PersistentCalls: m_Calls: [] delay: 1.2 - - barkText: And finally this one. + - barkConversation: audioClip: {fileID: 8300000, guid: 95492e8c1fe35114ab77e72b09c7c964, type: 3} responseEvent: m_PersistentCalls: @@ -408738,7 +408129,7 @@ MonoBehaviour: m_CallState: 2 delay: 2 m_incorrectResponse: - barkText: " This isn\u2019t the one..." + barkConversation: audioClip: {fileID: 8300000, guid: 7b9592c2c449b1d4e8d17fd90d278e6f, type: 3} responseEvent: m_PersistentCalls: @@ -414792,6 +414183,171 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1069874515} m_SourcePrefab: {fileID: 100100000, guid: 003daaab58a32ca419f0a3ef3dbef864, type: 3} +--- !u!43 &1523720395 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!4 &1523748495 stripped Transform: m_CorrespondingSourceObject: {fileID: 1771116250611894018, guid: b2f7b936f5a0ff94f8a13c16ffd4a17e, @@ -426791,6 +426347,171 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!43 &1560065398 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1560212635 PrefabInstance: m_ObjectHideFlags: 0 @@ -432057,104 +431778,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1563806269} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1593353210 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1331572457} - m_Modifications: - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalScale.x - value: 0.16058527 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalScale.y - value: 0.16058515 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalScale.z - value: 0.1605851 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalPosition.x - value: -0.004097954 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.01863636 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.0029663665 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.72066927 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.62342596 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.21699119 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.21187449 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 7.383 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 167.555 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637088, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 2.808 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637090, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_Name - value: Compas_MarkGrotto - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637090, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2654450439517637091, guid: 706ff2a2e06b91f44b298ec98aeb6040, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 706ff2a2e06b91f44b298ec98aeb6040, type: 3} --- !u!4 &1593518473 stripped Transform: m_CorrespondingSourceObject: {fileID: 4350983021728489828, guid: da4a586b899df9a4aa24f4ef40304970, @@ -501585,7 +501208,7 @@ MonoBehaviour: m_onDelay: 0 m_useOnce: 1 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -512007,7 +511630,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: -1 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -512734,7 +512357,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: -1 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -513844,7 +513467,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: 0 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -523981,7 +523604,7 @@ MonoBehaviour: m_onDelay: 0 m_useOnce: 1 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -543204,7 +542827,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: -1 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -547719,70 +547342,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1498586450} m_PrefabAsset: {fileID: 0} ---- !u!21 &2031185577 -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!1 &2031433312 GameObject: m_ObjectHideFlags: 0 @@ -561852,6 +561411,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4992e6bf97894c548ade38ee1eefb3cb, type: 3} +--- !u!43 &2096591617 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &2096897039 PrefabInstance: m_ObjectHideFlags: 0 @@ -632714,7 +632438,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 250708401} + - {fileID: 1231945976} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -632807,7 +632531,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 2031185577} + overrideMaterial: {fileID: 1268001914} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 diff --git a/Assets/Scripts/Quests/ActionResponse.cs b/Assets/Scripts/Quests/ActionResponse.cs index 8f2ba0b00..f2f198fbb 100644 --- a/Assets/Scripts/Quests/ActionResponse.cs +++ b/Assets/Scripts/Quests/ActionResponse.cs @@ -1,12 +1,15 @@ using System.Collections; using System.Collections.Generic; +using PixelCrushers.DialogueSystem; using UnityEngine; using UnityEngine.Events; [System.Serializable] public class ActionResponse { - public string barkText; + [Tooltip("Conversation to get bark content from.")] + [ConversationPopup(false)] + public string barkConversation; public AudioClip audioClip; public UnityEvent responseEvent; public float delay = 0f; diff --git a/Assets/Scripts/Quests/QuestTriggerBase.cs b/Assets/Scripts/Quests/QuestTriggerBase.cs index 8cf7e6b21..782c70c94 100644 --- a/Assets/Scripts/Quests/QuestTriggerBase.cs +++ b/Assets/Scripts/Quests/QuestTriggerBase.cs @@ -20,8 +20,9 @@ public class QuestTriggerBase : Saver public bool wasFired; } // Start is called before the first frame update - virtual public void Awake() + public override void Awake() { + base.Awake(); m_audioSource = GetComponent(); m_audioSource.playOnAwake = false; gameObject.layer = LayerMask.NameToLayer("Triggers"); @@ -40,13 +41,15 @@ public class QuestTriggerBase : Saver } - public virtual void Start() + public override void Start() { + base.Start(); Player.Instance.ThirdPersonController.onDead.AddListener(OnDead); } - public virtual void OnDestroy() + public override void OnDestroy() { + base.OnDestroy(); if (Player.Instance != null && Player.Instance.ThirdPersonController != null) Player.Instance.ThirdPersonController.onDead.RemoveListener(OnDead); } @@ -83,9 +86,10 @@ public class QuestTriggerBase : Saver m_audioSource.clip = action.audioClip; m_audioSource.Play(); } - if (action.barkText != null && action.barkText != "") + if (action.barkConversation != null && action.barkConversation != "") { - DialogueManager.BarkString(action.barkText, m_player); + //DialogueManager.BarkString(action.barkText, m_player); + BarkManager.Instance.PlayBark(action.barkConversation); } if (action.responseEvent != null) { diff --git a/Assets/Scripts/Triggers/ActionTrigger.cs b/Assets/Scripts/Triggers/ActionTrigger.cs index 35e7c2efa..7bf65b8df 100644 --- a/Assets/Scripts/Triggers/ActionTrigger.cs +++ b/Assets/Scripts/Triggers/ActionTrigger.cs @@ -1,6 +1,8 @@ using System; using System.Collections; using System.Collections.Generic; +using PixelCrushers.DialogueSystem; +using Sirenix.Utilities; using UnityEngine; namespace Beyond @@ -15,6 +17,9 @@ namespace Beyond public ActionResponse m_actionResponse; public MaterialChanger[] m_materialsToChange; + //[Tooltip("Conversation to get bark content from.")] + //[ConversationPopup(false)] + //public string m_conversationBark = string.Empty; [Serializable] @@ -86,6 +91,11 @@ namespace Beyond } } + //if (!m_conversationBark.IsNullOrWhitespace()) + //{ + // BarkManager.Instance.PlayBark(m_conversationBark); + //} + yield return null; } diff --git a/Assets/Scripts/Utils/BarkManager.cs b/Assets/Scripts/Utils/BarkManager.cs index 2a59f5850..ad6eb4a86 100644 --- a/Assets/Scripts/Utils/BarkManager.cs +++ b/Assets/Scripts/Utils/BarkManager.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using PixelCrushers; using PixelCrushers.DialogueSystem; using Sirenix.OdinInspector; +using Sirenix.Utilities; using UnityEngine; using Random = UnityEngine.Random; @@ -14,6 +15,9 @@ namespace Beyond [Serializable] public class Bark { + [Tooltip("Conversation to get bark content from.")] + [ConversationPopup(false)] + public string barkConversation = string.Empty; public string barkText; public AudioClip clip; } @@ -39,6 +43,26 @@ namespace Beyond public Queue m_barkQueue = new Queue(); public AudioSource m_audioSource; + private Dictionary m_conversationToEntry = new Dictionary(); + + private static BarkManager s_instance; + + public static BarkManager Instance => s_instance; + + public override void Awake() + { + base.Awake(); + if (s_instance != null) + { + Debug.LogError("BarkManager instance already exists! destroying..."); + Destroy(this); + } + else + { + s_instance = this; + } + } + public void PlayBark(int num) { m_barkQueue.Enqueue(num); @@ -72,6 +96,19 @@ namespace Beyond */ } + public void PlayBark(string conversation) + { + if (m_conversationToEntry.ContainsKey(conversation)) + { + m_barkQueue.Enqueue(m_conversationToEntry[conversation]); + + } + else + { + Debug.LogError("BarkManager: Conversation not found: "+conversation, this); + } + } + //private AudioSource audioSourceLast; //private GameObject audioSource => Player.Instance.audioSource; @@ -118,6 +155,10 @@ namespace Beyond //audioSourceLast = audioObject.GetComponent(); m_audioSource.PlayOneShot(b.clip); } + if (!string.IsNullOrWhiteSpace(b.barkConversation)) + { + DialogueManager.Bark(b.barkConversation, Player.Instance.transform); + } if (!string.IsNullOrEmpty(b.barkText)) { DialogueManager.BarkString(b.barkText, Player.Instance.transform); @@ -145,6 +186,14 @@ namespace Beyond m_saveData.wasPlayed = new bool[m_barks.Length]; for (int i = 0; i < m_saveData.wasPlayed.Length; i++) m_saveData.wasPlayed[i] = false; + for (int i=0; i