diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset index 5fdb4c753..90f4af6a1 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset @@ -11305,7 +11305,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Dialogue Text - value: 'These symbols... I saw them on the Ancient Gate! A key to opening ' + value: Light's blessing, it still works type: 0 typeString: CustomFieldType_Text - title: Parenthetical @@ -13262,7 +13262,9 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Dialogue Text - value: The scroll... It crumbled to dust. And yet... + value: 'A scroll... I need to find a way to open this grate. + +' type: 0 typeString: CustomFieldType_Text - title: Parenthetical @@ -30038,6 +30040,201 @@ MonoBehaviour: height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 + - id: 124 + fields: + - title: Title + value: CH01/WASTELAND/CH01_wasteland_vo_mechanism_wanderer_01 + 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: 124 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 124 + originDialogueID: 0 + destinationConversationID: 124 + 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: "The mechanism was too old... Ripped the rocks apart, and blocked + the way.\r" + 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: 124 + 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/Dialogue/TestDialogueBase (Auto-Backup).asset.meta b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta index d1521f54c..60ca5bb41 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a354d8457e3a93849a37b4d3b79d3661 +guid: 748d81795c101e94b933d9bf54003822 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Dialogue/TestDialogueBase.asset b/Assets/Dialogue/TestDialogueBase.asset index faa90c3fd..19f2b8682 100644 --- a/Assets/Dialogue/TestDialogueBase.asset +++ b/Assets/Dialogue/TestDialogueBase.asset @@ -13262,7 +13262,9 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Dialogue Text - value: The scroll... It crumbled to dust. And yet... + value: 'A scroll... I need to find a way to open this grate. + +' type: 0 typeString: CustomFieldType_Text - title: Parenthetical @@ -13650,7 +13652,8 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Dialogue Text - value: It worked! Who would have thought... + value: None of this makes sense. I couldn't have caused all this devastation + alone. And why wouldn't I remember? type: 0 typeString: CustomFieldType_Text - title: Parenthetical @@ -16958,8 +16961,8 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Dialogue Text - value: What a strange seed! I wonder if it would grow if I planted it in - good soil... + value: What a strange seed. I can feel it pulsing with life... Didn't I come + across some good soil some ways back? type: 0 typeString: CustomFieldType_Text - title: Parenthetical diff --git a/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_vo_altar_wanderer_02.ogg b/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_vo_altar_wanderer_02.ogg index 85afe2355..9bde28a56 100644 Binary files a/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_vo_altar_wanderer_02.ogg and b/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_vo_altar_wanderer_02.ogg differ diff --git a/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_vo_blocked_wanderer_04.ogg b/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_vo_blocked_wanderer_04.ogg index 85ba8f9bc..83219624a 100644 Binary files a/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_vo_blocked_wanderer_04.ogg and b/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_vo_blocked_wanderer_04.ogg differ diff --git a/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_vo_soil_wanderer_02.ogg b/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_vo_soil_wanderer_02.ogg index cc4c56158..55c71b8b1 100644 Binary files a/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_vo_soil_wanderer_02.ogg and b/Assets/Resources/Dialogues/VO/CH01/CH01_wasteland_vo_soil_wanderer_02.ogg differ diff --git a/Assets/Scenes/Land_01/demo_postptrocesINTRO.unity b/Assets/Scenes/Land_01/demo_postptrocesINTRO.unity index 2fb102fc5..007508673 100644 --- a/Assets/Scenes/Land_01/demo_postptrocesINTRO.unity +++ b/Assets/Scenes/Land_01/demo_postptrocesINTRO.unity @@ -666507,7 +666507,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1852784124646723890} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} m_Name: @@ -667927,7 +667927,7 @@ Transform: m_GameObject: {fileID: 1852784124646723890} serializedVersion: 2 m_LocalRotation: {x: -0.025274524, y: 0.7768268, z: -0.002675936, w: 0.62920123} - m_LocalPosition: {x: 10.594, y: 36.74, z: -209.99} + m_LocalPosition: {x: 11.284, y: 33.064, z: -208.992} m_LocalScale: {x: 10.736679, y: 4.772168, z: 0.98473996} m_ConstrainProportionsScale: 0 m_Children: [] @@ -679553,7 +679553,7 @@ Transform: m_GameObject: {fileID: 493125743940888533} serializedVersion: 2 m_LocalRotation: {x: -0.0023648303, y: 0.9914558, z: -0.011391441, w: -0.12992366} - m_LocalPosition: {x: 25.869, y: 34.774, z: -212.676} + m_LocalPosition: {x: 23.781, y: 31.803, z: -212.048} m_LocalScale: {x: 1.4794296, y: 6.209966, z: 11.1338215} m_ConstrainProportionsScale: 0 m_Children: [] @@ -679911,7 +679911,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 612596415400512463} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} m_Name: @@ -681779,13 +681779,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5141108707029486390} serializedVersion: 2 - m_LocalRotation: {x: -0.0215528, y: 0.9995372, z: 0.013469935, w: 0.016718019} - m_LocalPosition: {x: 37.854, y: 33.01, z: -207.274} - m_LocalScale: {x: 5.3450184, y: 4.2468348, z: 0.87633705} + m_LocalRotation: {x: -0.018184127, y: 0.97297466, z: 0.017756684, w: 0.22950901} + m_LocalPosition: {x: 37.35, y: 33, z: -207.6} + m_LocalScale: {x: 10.049715, y: 7.984908, z: 2.8567665} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4162766988877471287} - m_LocalEulerAnglesHint: {x: -1.584, y: 178.117, z: -2.444} + m_LocalEulerAnglesHint: {x: -2.459, y: 153.488, z: -1.562} --- !u!4 &3633369735788595505 Transform: m_ObjectHideFlags: 0 @@ -688764,7 +688764,7 @@ BoxCollider: m_LayerOverridePriority: 0 m_IsTrigger: 1 m_ProvidesContacts: 0 - m_Enabled: 0 + m_Enabled: 1 serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -698110,7 +698110,7 @@ Transform: m_GameObject: {fileID: 612596415400512463} serializedVersion: 2 m_LocalRotation: {x: -0.00040540696, y: 0.99915093, z: -0.011627252, w: 0.03952312} - m_LocalPosition: {x: 38.434, y: 35.083, z: -210.51} + m_LocalPosition: {x: 38.411, y: 36.313, z: -210.54} m_LocalScale: {x: 1.4794296, y: 3.3544092, z: 2.9725618} m_ConstrainProportionsScale: 0 m_Children: [] @@ -723637,7 +723637,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} m_Name: m_EditorClassIdentifier: - trigger: 32 + trigger: 8 fireOnce: 1 condition: luaConditions: []