diff --git a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin index 1531a70f8..23f04aa81 100644 Binary files a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin and b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin differ diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset index 17877c76e..42b6431d6 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset @@ -905,6 +905,34 @@ MonoBehaviour: value: type: 0 typeString: CustomFieldType_Text + - id: 21 + fields: + - title: Name + value: CH02SpiderBossKilled + type: 0 + typeString: CustomFieldType_Text + - title: Initial Value + value: False + type: 2 + typeString: CustomFieldType_Boolean + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - id: 22 + fields: + - title: Name + value: CH02HannaHouseVisited + type: 0 + typeString: CustomFieldType_Text + - title: Initial Value + value: False + type: 2 + typeString: CustomFieldType_Boolean + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text conversations: - id: 1 fields: @@ -24067,7 +24095,7 @@ MonoBehaviour: - title: Title value: START type: 0 - typeString: + typeString: CustomFieldType_Text - title: Pictures value: '[]' type: 3 @@ -24075,7 +24103,7 @@ MonoBehaviour: - title: Description value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Actor value: 1 type: 5 @@ -24087,15 +24115,15 @@ MonoBehaviour: - title: Menu Text value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Dialogue Text value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Parenthetical value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Audio Files value: '[]' type: 3 @@ -24103,11 +24131,11 @@ MonoBehaviour: - title: Video File value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Sequence value: None() type: 0 - typeString: + typeString: CustomFieldType_Text - title: pl value: type: 4 @@ -24132,6 +24160,12 @@ MonoBehaviour: destinationDialogueID: 10 isConnector: 0 priority: 2 + - originConversationID: 96 + originDialogueID: 0 + destinationConversationID: 96 + destinationDialogueID: 11 + isConnector: 0 + priority: 2 conditionsString: userScript: onExecute: @@ -24562,7 +24596,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Herbalist/Q3_Beggar_n_4) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24583,7 +24617,8 @@ MonoBehaviour: destinationDialogueID: 8 isConnector: 0 priority: 2 - conditionsString: Variable["CH02HerbalistSpoke"] == true + conditionsString: Variable["CH02HerbalistSpoke"] == true and (Variable["CH02SpiderBossKilled"] + == false) userScript: onExecute: m_PersistentCalls: @@ -24638,7 +24673,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Herbalist/Q3_Beggar_n_5) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24713,7 +24748,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: Audio(Dialogues/VO/CH02/Beggar/CH02_vo_herbalist_wanderer_03) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24815,6 +24850,152 @@ MonoBehaviour: y: 101 width: 160 height: 30 + - id: 11 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: The spider crone is dead... After all these years of terror... Alas, + her brood survives, and soon another shall take her place. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Spider_Boss/Q3_Beggar_n_6) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 96 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 96 + originDialogueID: 11 + destinationConversationID: 96 + destinationDialogueID: 12 + isConnector: 0 + priority: 2 + conditionsString: Variable["CH02SpiderBossKilled"] == true + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 478 + y: 71 + width: 160 + height: 30 + - id: 12 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: And her poison still defiles the river. Nothing ever changes. This + land is beyond hope. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Spider_Boss/Q3_Beggar_n_7) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 96 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 478 + y: 121 + width: 160 + height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 - id: 97 @@ -26964,7 +27145,7 @@ MonoBehaviour: - id: 108 fields: - title: Title - value: CH02/RUINEDTOWN/HerbalistDialogue + value: CH02/RUINEDTOWN/WitchDialogue type: 0 typeString: CustomFieldType_Text - title: Pictures @@ -27070,7 +27251,7 @@ MonoBehaviour: - originConversationID: 108 originDialogueID: 0 destinationConversationID: 108 - destinationDialogueID: 1 + destinationDialogueID: 4 isConnector: 0 priority: 2 conditionsString: @@ -27084,7 +27265,7 @@ MonoBehaviour: y: 30 width: 160 height: 30 - - id: 1 + - id: 4 fields: - title: Title value: @@ -27099,11 +27280,11 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Actor - value: 8 + value: 1 type: 5 typeString: CustomFieldType_Actor - title: Conversant - value: 1 + value: 2 type: 5 typeString: CustomFieldType_Actor - title: Menu Text @@ -27111,8 +27292,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Dialogue Text - value: Aaah, yes. Do you like my crystal? if you are interested, I will gladly - trade it for something I need. + value: Your voice... Your face... They feel familiar somehow. type: 0 typeString: CustomFieldType_Text - title: Parenthetical @@ -27128,7 +27308,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_wonderer_00) type: 0 typeString: CustomFieldType_Text - title: pl @@ -27144,9 +27324,9 @@ MonoBehaviour: conditionPriority: 2 outgoingLinks: - originConversationID: 108 - originDialogueID: 1 + originDialogueID: 4 destinationConversationID: 108 - destinationDialogueID: 2 + destinationDialogueID: 5 isConnector: 0 priority: 2 conditionsString: @@ -27156,11 +27336,11 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 - y: 80 + x: 28.079865 + y: 109.3712 width: 160 height: 30 - - id: 2 + - id: 5 fields: - title: Title value: @@ -27175,11 +27355,11 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Actor - value: 1 + value: 2 type: 5 typeString: CustomFieldType_Actor - title: Conversant - value: 8 + value: 1 type: 5 typeString: CustomFieldType_Actor - title: Menu Text @@ -27187,7 +27367,8 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Dialogue Text - value: And what would that be? + value: Liar... You knew my starlight, but you only though you knew him, yes... + And you listened to the dark whispers. And you fell. type: 0 typeString: CustomFieldType_Text - title: Parenthetical @@ -27203,7 +27384,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_witch_01) type: 0 typeString: CustomFieldType_Text - title: pl @@ -27219,9 +27400,9 @@ MonoBehaviour: conditionPriority: 2 outgoingLinks: - originConversationID: 108 - originDialogueID: 2 + originDialogueID: 5 destinationConversationID: 108 - destinationDialogueID: 3 + destinationDialogueID: 6 isConnector: 0 priority: 2 conditionsString: @@ -27231,11 +27412,11 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 - y: 130 + x: 28.079865 + y: 159.3712 width: 160 height: 30 - - id: 3 + - id: 6 fields: - title: Title value: @@ -27250,11 +27431,11 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Actor - value: 8 + value: 1 type: 5 typeString: CustomFieldType_Actor - title: Conversant - value: 1 + value: 2 type: 5 typeString: CustomFieldType_Actor - title: Menu Text @@ -27262,9 +27443,8 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Dialogue Text - value: Take this key. It opens a gate to an old courtyard. A foul creature - named Xasarath made her lair there... Bring me her poison gland, and I - will trade you the crystal. + value: It cannot be... Are you Zora? The wisest sorceress among the Princes + of the Light? I remember you! What happened to you?! type: 0 typeString: CustomFieldType_Text - title: Parenthetical @@ -27280,7 +27460,160 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_wonderer_02) + type: 0 + typeString: CustomFieldType_Text + - title: pl value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 108 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 108 + originDialogueID: 6 + destinationConversationID: 108 + destinationDialogueID: 7 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 28.079865 + y: 241.3712 + width: 160 + height: 30 + - id: 7 + 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: Speak not as if you KNOW me, deceiver! You are as blind to the greater + truths now, as you were before! Cast not thy judgements upon your betters! + Leave me and my starlight alone in our misery! + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_witch_02) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 108 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 108 + originDialogueID: 7 + destinationConversationID: 108 + destinationDialogueID: 8 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 28.079865 + y: 291.37122 + width: 160 + height: 30 + - id: 8 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: I'm sorry, Zora. I'm sorry for whatever happened to you. I will try + to fix it, I swear. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_wonderer_03) type: 0 typeString: CustomFieldType_Text - title: pl @@ -27302,12 +27635,12 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 25 - y: 189 + x: 28.079865 + y: 341.37122 width: 160 height: 30 - canvasScrollPosition: {x: 0, y: 0} - canvasZoom: 1 + canvasScrollPosition: {x: 52.319527, y: 14.465763} + canvasZoom: 1.0760005 - id: 109 fields: - title: Title @@ -31784,6 +32117,354 @@ MonoBehaviour: height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 + - id: 132 + fields: + - title: Title + value: CH02/RUINEDTOWN/WitchHouse + 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: 8 + 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: 8 + 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: 132 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: + conditionPriority: 2 + outgoingLinks: + - originConversationID: 132 + originDialogueID: 0 + destinationConversationID: 132 + 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: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 8 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: And who might you be, wanderer? You come with your sword oh so bright, + you come into my home, and what do you bring, huh? What do you bring beside + more lies and misery? + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/House/CH02_vo_witch_witch_00) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 132 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 132 + originDialogueID: 1 + destinationConversationID: 132 + destinationDialogueID: 2 + isConnector: 0 + priority: 2 + conditionsString: Variable["CH02HannaHouseVisited"] == false + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 80 + width: 160 + height: 30 + - id: 2 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 8 + 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: I... Am looking for someone. You needn't fear me, my lady. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/House/CH02_vo_witch_wonderer_01) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 132 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 132 + originDialogueID: 2 + destinationConversationID: 132 + destinationDialogueID: 3 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 130 + width: 160 + height: 30 + - id: 3 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 8 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: Lady, he says. Lady, he titles me. Liar. And madman. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/House/CH02_vo_witch_witch_03) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 132 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: 'Variable["CH02HannaHouseVisited"] = true; + +' + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 180 + width: 160 + height: 30 + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 0.9990002 syncInfo: syncActors: 0 syncItems: 0 diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta index 61d7b5e0f..0b77cb43a 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c84b775d4f6240b185527d49e09404f +guid: 8aff4fa97fd094b00a15ff4a0a2ffc3e NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Dialogue/TestDialogueBase.asset b/Assets/Dialogue/TestDialogueBase.asset index 6c1caadf1..b0feb5f79 100644 --- a/Assets/Dialogue/TestDialogueBase.asset +++ b/Assets/Dialogue/TestDialogueBase.asset @@ -849,20 +849,6 @@ MonoBehaviour: value: '#B. gains 3 or 5 BP depending on his choices' type: 0 typeString: - - id: 17 - fields: - - title: Name - value: CH02HerbalistSpoke - type: 0 - typeString: CustomFieldType_Text - - title: Initial Value - value: False - type: 2 - typeString: CustomFieldType_Boolean - - title: Description - value: - type: 0 - typeString: CustomFieldType_Text - id: 18 fields: - title: Name @@ -905,6 +891,48 @@ MonoBehaviour: value: type: 0 typeString: CustomFieldType_Text + - id: 21 + fields: + - title: Name + value: CH02SpiderBossKilled + type: 0 + typeString: CustomFieldType_Text + - title: Initial Value + value: False + type: 2 + typeString: CustomFieldType_Boolean + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - id: 17 + fields: + - title: Name + value: CH02HerbalistSpoke + type: 0 + typeString: CustomFieldType_Text + - title: Initial Value + value: False + type: 2 + typeString: CustomFieldType_Boolean + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - id: 22 + fields: + - title: Name + value: CH02HannaHouseVisited + type: 0 + typeString: CustomFieldType_Text + - title: Initial Value + value: False + type: 2 + typeString: CustomFieldType_Boolean + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text conversations: - id: 1 fields: @@ -24067,7 +24095,7 @@ MonoBehaviour: - title: Title value: START type: 0 - typeString: + typeString: CustomFieldType_Text - title: Pictures value: '[]' type: 3 @@ -24075,7 +24103,7 @@ MonoBehaviour: - title: Description value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Actor value: 1 type: 5 @@ -24087,15 +24115,15 @@ MonoBehaviour: - title: Menu Text value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Dialogue Text value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Parenthetical value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Audio Files value: '[]' type: 3 @@ -24103,11 +24131,11 @@ MonoBehaviour: - title: Video File value: type: 0 - typeString: + typeString: CustomFieldType_Text - title: Sequence value: None() type: 0 - typeString: + typeString: CustomFieldType_Text - title: pl value: type: 4 @@ -24132,6 +24160,12 @@ MonoBehaviour: destinationDialogueID: 10 isConnector: 0 priority: 2 + - originConversationID: 96 + originDialogueID: 0 + destinationConversationID: 96 + destinationDialogueID: 11 + isConnector: 0 + priority: 2 conditionsString: userScript: onExecute: @@ -24562,7 +24596,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Herbalist/Q3_Beggar_n_4) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24583,7 +24617,8 @@ MonoBehaviour: destinationDialogueID: 8 isConnector: 0 priority: 2 - conditionsString: Variable["CH02HerbalistSpoke"] == true + conditionsString: Variable["CH02HerbalistSpoke"] == true and (Variable["CH02SpiderBossKilled"] + == false) userScript: onExecute: m_PersistentCalls: @@ -24638,7 +24673,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Herbalist/Q3_Beggar_n_5) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24713,7 +24748,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: Audio(Dialogues/VO/CH02/Beggar/CH02_vo_herbalist_wanderer_03) type: 0 typeString: CustomFieldType_Text - title: pl @@ -24815,6 +24850,152 @@ MonoBehaviour: y: 101 width: 160 height: 30 + - id: 11 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: The spider crone is dead... After all these years of terror... Alas, + her brood survives, and soon another shall take her place. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Spider_Boss/Q3_Beggar_n_6) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 96 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 96 + originDialogueID: 11 + destinationConversationID: 96 + destinationDialogueID: 12 + isConnector: 0 + priority: 2 + conditionsString: Variable["CH02SpiderBossKilled"] == true + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 478 + y: 71 + width: 160 + height: 30 + - id: 12 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: And her poison still defiles the river. Nothing ever changes. This + land is beyond hope. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Spider_Boss/Q3_Beggar_n_7) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 96 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 478 + y: 121 + width: 160 + height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 - id: 97 @@ -26964,7 +27145,7 @@ MonoBehaviour: - id: 108 fields: - title: Title - value: CH02/RUINEDTOWN/HerbalistDialogue + value: CH02/RUINEDTOWN/WitchDialogue type: 0 typeString: CustomFieldType_Text - title: Pictures @@ -27070,7 +27251,7 @@ MonoBehaviour: - originConversationID: 108 originDialogueID: 0 destinationConversationID: 108 - destinationDialogueID: 1 + destinationDialogueID: 4 isConnector: 0 priority: 2 conditionsString: @@ -27084,7 +27265,7 @@ MonoBehaviour: y: 30 width: 160 height: 30 - - id: 1 + - id: 4 fields: - title: Title value: @@ -27099,11 +27280,11 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Actor - value: 8 + value: 1 type: 5 typeString: CustomFieldType_Actor - title: Conversant - value: 1 + value: 2 type: 5 typeString: CustomFieldType_Actor - title: Menu Text @@ -27111,8 +27292,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Dialogue Text - value: Aaah, yes. Do you like my crystal? if you are interested, I will gladly - trade it for something I need. + value: Your voice... Your face... They feel familiar somehow. type: 0 typeString: CustomFieldType_Text - title: Parenthetical @@ -27128,7 +27308,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_wonderer_00) type: 0 typeString: CustomFieldType_Text - title: pl @@ -27144,9 +27324,9 @@ MonoBehaviour: conditionPriority: 2 outgoingLinks: - originConversationID: 108 - originDialogueID: 1 + originDialogueID: 4 destinationConversationID: 108 - destinationDialogueID: 2 + destinationDialogueID: 5 isConnector: 0 priority: 2 conditionsString: @@ -27156,11 +27336,11 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 - y: 80 + x: 28.079865 + y: 109.3712 width: 160 height: 30 - - id: 2 + - id: 5 fields: - title: Title value: @@ -27175,11 +27355,11 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Actor - value: 1 + value: 2 type: 5 typeString: CustomFieldType_Actor - title: Conversant - value: 8 + value: 1 type: 5 typeString: CustomFieldType_Actor - title: Menu Text @@ -27187,7 +27367,8 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Dialogue Text - value: And what would that be? + value: Liar... You knew my starlight, but you only though you knew him, yes... + And you listened to the dark whispers. And you fell. type: 0 typeString: CustomFieldType_Text - title: Parenthetical @@ -27203,7 +27384,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_witch_01) type: 0 typeString: CustomFieldType_Text - title: pl @@ -27219,9 +27400,9 @@ MonoBehaviour: conditionPriority: 2 outgoingLinks: - originConversationID: 108 - originDialogueID: 2 + originDialogueID: 5 destinationConversationID: 108 - destinationDialogueID: 3 + destinationDialogueID: 6 isConnector: 0 priority: 2 conditionsString: @@ -27231,11 +27412,11 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 - y: 130 + x: 28.079865 + y: 159.3712 width: 160 height: 30 - - id: 3 + - id: 6 fields: - title: Title value: @@ -27250,11 +27431,11 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Actor - value: 8 + value: 1 type: 5 typeString: CustomFieldType_Actor - title: Conversant - value: 1 + value: 2 type: 5 typeString: CustomFieldType_Actor - title: Menu Text @@ -27262,9 +27443,8 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Dialogue Text - value: Take this key. It opens a gate to an old courtyard. A foul creature - named Xasarath made her lair there... Bring me her poison gland, and I - will trade you the crystal. + value: It cannot be... Are you Zora? The wisest sorceress among the Princes + of the Light? I remember you! What happened to you?! type: 0 typeString: CustomFieldType_Text - title: Parenthetical @@ -27280,7 +27460,160 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_wonderer_02) + type: 0 + typeString: CustomFieldType_Text + - title: pl value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 108 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 108 + originDialogueID: 6 + destinationConversationID: 108 + destinationDialogueID: 7 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 28.079865 + y: 241.3712 + width: 160 + height: 30 + - id: 7 + 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: Speak not as if you KNOW me, deceiver! You are as blind to the greater + truths now, as you were before! Cast not thy judgements upon your betters! + Leave me and my starlight alone in our misery! + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_witch_02) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 108 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 108 + originDialogueID: 7 + destinationConversationID: 108 + destinationDialogueID: 8 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 28.079865 + y: 291.37122 + width: 160 + height: 30 + - id: 8 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 8 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: I'm sorry, Zora. I'm sorry for whatever happened to you. I will try + to fix it, I swear. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_wonderer_03) type: 0 typeString: CustomFieldType_Text - title: pl @@ -27302,12 +27635,12 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 25 - y: 189 + x: 28.079865 + y: 341.37122 width: 160 height: 30 - canvasScrollPosition: {x: 0, y: 0} - canvasZoom: 1 + canvasScrollPosition: {x: 54.582294, y: 15.388398} + canvasZoom: 1.0820013 - id: 109 fields: - title: Title @@ -31784,6 +32117,779 @@ MonoBehaviour: height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 + - id: 132 + fields: + - title: Title + value: CH02/RUINEDTOWN/WitchHouse + 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: 8 + 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: 8 + 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: 132 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: + conditionPriority: 2 + outgoingLinks: + - originConversationID: 132 + originDialogueID: 0 + destinationConversationID: 132 + 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: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 8 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: And who might you be, wanderer? You come with your sword oh so bright, + you come into my home, and what do you bring, huh? What do you bring beside + more lies and misery? + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/House/CH02_vo_witch_witch_00) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 132 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 132 + originDialogueID: 1 + destinationConversationID: 132 + destinationDialogueID: 2 + isConnector: 0 + priority: 2 + conditionsString: Variable["CH02HannaHouseVisited"] == false + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 80 + width: 160 + height: 30 + - id: 2 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 8 + 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: I... Am looking for someone. You needn't fear me, my lady. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/House/CH02_vo_witch_wonderer_01) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 132 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 132 + originDialogueID: 2 + destinationConversationID: 132 + destinationDialogueID: 3 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 130 + width: 160 + height: 30 + - id: 3 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 8 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: Lady, he says. Lady, he titles me. Liar. And madman. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/House/CH02_vo_witch_witch_03) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 132 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: 'Variable["CH02HannaHouseVisited"] = true; + +' + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 180 + width: 160 + height: 30 + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 0.9990002 + - id: 133 + fields: + - title: Title + value: CH02/RUINEDTOWN/WitchCrystal + 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: 8 + 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: 8 + 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: 133 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 133 + originDialogueID: 0 + destinationConversationID: 133 + 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: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 8 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: What strange crystal... Unlike anything I've yet seen. And it pulses + with power. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Altar/CH02_vo_crystal_wonderer_01) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 133 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 133 + originDialogueID: 1 + destinationConversationID: 133 + destinationDialogueID: 2 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 80 + width: 160 + height: 30 + - id: 2 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 8 + 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: But you can't have it! The crystal, it guards, you see! It guards + the pretty one, doesn't it, my starlight, my beloved? I can trade it, but + I doubt a liar of such renown would trade fairly with me... + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Altar/CH02_vo_crystal_zora_01) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 133 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 133 + originDialogueID: 2 + destinationConversationID: 133 + destinationDialogueID: 3 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 130 + width: 160 + height: 30 + - id: 3 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 8 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: I promise by the name of the King himself, I won't deceive you. What + do you want for the crystal? + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Altar/CH02_vo_crystal_wonderer_02) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 133 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 133 + originDialogueID: 3 + destinationConversationID: 133 + destinationDialogueID: 4 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 180 + width: 160 + height: 30 + - id: 4 + 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: 8 + 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: Take this key. It opens a gate to an old courtyard. The foul Xasarath + made her lair there... Bring me her poison gland, and I will trade you + the crystal, as my starlight's my witness. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Altar/CH02_vo_crystal_zora_02) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 133 + 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: 230 + width: 160 + height: 30 + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 1 syncInfo: syncActors: 0 syncItems: 0 diff --git a/Assets/Meshes/scroll/scrollMat2D.mat b/Assets/Meshes/scroll/scrollMat2D.mat index f072a9e34..7fad8ae2c 100644 --- a/Assets/Meshes/scroll/scrollMat2D.mat +++ b/Assets/Meshes/scroll/scrollMat2D.mat @@ -138,7 +138,7 @@ Material: - _MaxBrightness: 1 - _Metallic: 0 - _MinBrightness: 0 - - _NoiseScale: 1.0038235 + - _NoiseScale: 1.013747 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueControl: 0 diff --git a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity index 8774b5b89..5c5a8f70f 100644 --- a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity +++ b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity @@ -1994,6 +1994,130 @@ Transform: m_Children: [] m_Father: {fileID: 115258996} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &17702562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 17702563} + - component: {fileID: 17702565} + - component: {fileID: 17702564} + m_Layer: 11 + m_Name: WitchHouseVisitTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &17702563 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 17702562} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0.353883, z: 0, w: 0.93528974} + m_LocalPosition: {x: -66.402, y: 42.383, z: 141.264} + m_LocalScale: {x: 1.34, y: 1, z: 1.84} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 830642059} + m_LocalEulerAnglesHint: {x: 0, y: -41.45, z: 0} +--- !u!114 &17702564 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 17702562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} + m_Name: + m_EditorClassIdentifier: + trigger: 8 + fireOnce: 1 + condition: + luaConditions: + - Variable["CH02HannaHouseVisited"] == false + questConditions: [] + acceptedTags: + - Player + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + setQuestState: 1 + questName: + questState: 0 + setQuestEntryState: 0 + questEntryNumber: 1 + questEntryState: 0 + luaCode: + sequence: + sequenceSpeaker: {fileID: 0} + sequenceListener: {fileID: 0} + waitOneFrameOnStartOrEnable: 1 + alertMessage: + textTable: {fileID: 0} + alertDuration: 0 + sendMessages: [] + barkSource: 0 + barkConversation: + barkText: + barkTextSequence: + barker: {fileID: 0} + barkTarget: {fileID: 0} + barkOrder: 0 + allowBarksDuringConversations: 0 + skipBarkIfNoValidEntries: 0 + cacheBarkLines: 0 + conversation: CH02/RUINEDTOWN/WitchHouse + conversationConversant: {fileID: 0} + conversationActor: {fileID: 0} + startConversationEntryID: -1 + exclusive: 0 + skipIfNoValidEntries: 0 + stopConversationOnTriggerExit: 0 + stopConversationIfTooFar: 0 + maxConversationDistance: 5 + monitorConversationDistanceFrequency: 1 + showCursorDuringConversation: 0 + pauseGameDuringConversation: 0 + setActiveActions: [] + setEnabledActions: [] + setAnimatorStateActions: [] + onExecute: + m_PersistentCalls: + m_Calls: [] + useConversationTitlePicker: 1 + useBarkTitlePicker: 1 + useQuestNamePicker: 1 + selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} +--- !u!65 &17702565 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 17702562} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &17841907 PrefabInstance: m_ObjectHideFlags: 0 @@ -5781,7 +5905,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1652919104} + objectReference: {fileID: 1108983342} - target: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Name @@ -18265,6 +18389,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 919770174} m_PrefabAsset: {fileID: 0} +--- !u!21 &123331103 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Height Fog Global + m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3002 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _TITLE: 1 + - _TransparentQueue: 3000 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!4 &123610059 stripped Transform: m_CorrespondingSourceObject: {fileID: 6834609825192720160, guid: d419e125d0071454c82743d15356b5f1, @@ -46325,6 +46482,27 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 6512215053017429888, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: MaxDistance + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 6512215053017429888, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: MinDistance + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 6512215053017429888, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 385000820370598951, guid: 5dd761199ee4b7045a10fd9b79e36026, + type: 2} + - target: {fileID: 6512215053017429888, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: spreadCustomCurve.m_Curve.Array.data[0].value + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, type: 3} propertyPath: m_Enabled @@ -46377,7 +46555,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 320848345} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1087288915} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 82f8f534f4d73499ea554681a3e99a4a, type: 3} @@ -47783,6 +47961,18 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3ef32dcb7e900c245b48572d43b140b4, type: 3} +--- !u!1 &341440045 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + m_PrefabInstance: {fileID: 1543425059} + m_PrefabAsset: {fileID: 0} +--- !u!4 &341440046 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + m_PrefabInstance: {fileID: 1543425059} + m_PrefabAsset: {fileID: 0} --- !u!1001 &342106202 PrefabInstance: m_ObjectHideFlags: 0 @@ -50662,6 +50852,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 362661433} m_PrefabAsset: {fileID: 0} +--- !u!43 &363703263 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!4 &363731423 stripped Transform: m_CorrespondingSourceObject: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, @@ -52548,6 +52903,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 115258996} m_Modifications: + - target: {fileID: 1261154061, guid: fa870148d44a68e488cb8548bbef30c6, type: 3} + propertyPath: selectedToolbar + value: 2 + objectReference: {fileID: 0} - target: {fileID: 113322287624229236, guid: fa870148d44a68e488cb8548bbef30c6, type: 3} propertyPath: m_IsActive @@ -64393,6 +64752,171 @@ MonoBehaviour: _disableOnStart: 0 _useDistanceFade: 0 _fadeRange: 5 +--- !u!43 &450969364 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &451714873 PrefabInstance: m_ObjectHideFlags: 0 @@ -125016,39 +125540,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 341145034} m_PrefabAsset: {fileID: 0} ---- !u!21 &771685080 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &772976529 PrefabInstance: m_ObjectHideFlags: 0 @@ -127115,171 +127606,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 791567355} m_PrefabAsset: {fileID: 0} ---- !u!43 &791755172 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 9.72, z: 13.65} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 9.72, z: 13.65} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &791988278 PrefabInstance: m_ObjectHideFlags: 0 @@ -132344,6 +132670,8 @@ Transform: - {fileID: 1723767138} - {fileID: 1223287650} - {fileID: 657758459} + - {fileID: 17702563} + - {fileID: 1820636052} - {fileID: 1603726903} - {fileID: 1905145261} m_Father: {fileID: 0} @@ -146111,70 +146439,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 933227953} m_PrefabAsset: {fileID: 0} ---- !u!21 &934523553 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _DIRECTIONALL: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _DirectionalMode: 1 - - _FOGG: 1 - - _FogAxisMode: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 200 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: -200 - - _FogHeightEnd: 200 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _NOISEE: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMode: 2 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SKYBOXX: 1 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _TITLE: 1 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &934542446 PrefabInstance: m_ObjectHideFlags: 0 @@ -165746,6 +166010,150 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f00a42f926f91b744b4f2658f1c884b9, type: 3} +--- !u!1001 &1078730711 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1099537664} + m_Modifications: + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalScale.x + value: 11.968117 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalScale.y + value: 11.968117 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalScale.z + value: 11.968117 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalPosition.x + value: -152.88 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.13399887 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalPosition.z + value: 329.73 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2065518434898640957, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Name + value: Bark_lament_beggar_witch + objectReference: {fileID: 0} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Layer + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6512215053017429888, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 385000820370598951, guid: 5dd761199ee4b7045a10fd9b79e36026, + type: 2} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: triggeringLayers.m_Bits + value: 256 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: startAutomaticallyOnLoad + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: barkManagerEntryIndices.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: 'barkManagerEntryIndices.Array.data[0]' + value: 96 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: 'barkManagerEntryIndices.Array.data[1]' + value: 98 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: 'barkManagerEntryIndices.Array.data[2]' + value: 99 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 328b55d817523634f85d1e8a144d9dd4, type: 3} --- !u!1001 &1078908160 PrefabInstance: m_ObjectHideFlags: 0 @@ -166407,6 +166815,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0b3e1f0239d23ce439870753c33af406, type: 3} +--- !u!1 &1087288915 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + m_PrefabInstance: {fileID: 320848345} + m_PrefabAsset: {fileID: 0} --- !u!4 &1087962447 stripped Transform: m_CorrespondingSourceObject: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, @@ -168287,7 +168701,10 @@ Transform: - {fileID: 77641632} - {fileID: 143530224} - {fileID: 956719168} + - {fileID: 1410170353} - {fileID: 320848346} + - {fileID: 2042575153} + - {fileID: 341440046} - {fileID: 1608354591} - {fileID: 1373640430} - {fileID: 1356411111} @@ -169009,6 +169426,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 493aa7eba03489345b4b1ed9a2a9cc51, type: 3} +--- !u!43 &1108983342 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1109238395 GameObject: m_ObjectHideFlags: 0 @@ -207425,6 +208007,179 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1408508752} m_Mesh: {fileID: 1580507954859102490, guid: e574c732e655792458c8e99df81aa5b9, type: 3} +--- !u!1 &1410170352 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1410170353} + - component: {fileID: 1410170355} + - component: {fileID: 1410170354} + m_Layer: 0 + m_Name: Lament Coditional Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1410170353 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410170352} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1099537664} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1410170354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410170352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6709a146e599d4c46882e1173a52b192, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: Lament2 + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + condition: + luaConditions: + - Variable["CH02HerbalistSpoke"] == true + - Variable["CH02SpiderBossKilled"] == true + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + fireOnce: 1 + onConditionTrue: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1087288915} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 2042575152} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 341440045} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + onConditionFalse: + m_PersistentCalls: + m_Calls: [] + selectedDatabase: {fileID: 0} + CheckInterval: 1 +--- !u!114 &1410170355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410170352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6709a146e599d4c46882e1173a52b192, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: Lament1 + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + condition: + luaConditions: + - Variable["CH02HerbalistSpoke"] == true + - Variable["CH02SpiderBossKilled"] == false + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + fireOnce: 1 + onConditionTrue: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1087288915} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 2042575152} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 341440045} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onConditionFalse: + m_PersistentCalls: + m_Calls: [] + selectedDatabase: {fileID: 0} + CheckInterval: 1 --- !u!1 &1410678329 GameObject: m_ObjectHideFlags: 0 @@ -225003,6 +225758,150 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1543159403} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1543425059 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1099537664} + m_Modifications: + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalScale.x + value: 11.968117 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalScale.y + value: 11.968117 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalScale.z + value: 11.968117 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalPosition.x + value: -152.88 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.13399887 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalPosition.z + value: 329.73 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2065518434898640957, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Name + value: Bark_lament_beggar_spider + objectReference: {fileID: 0} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Layer + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6512215053017429888, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 385000820370598951, guid: 5dd761199ee4b7045a10fd9b79e36026, + type: 2} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: triggeringLayers.m_Bits + value: 256 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: startAutomaticallyOnLoad + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: barkManagerEntryIndices.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: 'barkManagerEntryIndices.Array.data[0]' + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: 'barkManagerEntryIndices.Array.data[1]' + value: 99 + objectReference: {fileID: 0} + - target: {fileID: 8117314713044463352, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + propertyPath: 'barkManagerEntryIndices.Array.data[2]' + value: 99 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 328b55d817523634f85d1e8a144d9dd4, type: 3} --- !u!1001 &1543854356 PrefabInstance: m_ObjectHideFlags: 0 @@ -239682,171 +240581,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1652905887} m_PrefabAsset: {fileID: 0} ---- !u!43 &1652919104 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 10, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 10, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1652933643 PrefabInstance: m_ObjectHideFlags: 0 @@ -246338,171 +247072,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5f757d9f8ec3fd847b9425282b71d2a9, type: 3} ---- !u!43 &1686013631 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 10, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 10, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1686406200 PrefabInstance: m_ObjectHideFlags: 0 @@ -248814,7 +249383,7 @@ MonoBehaviour: allowBarksDuringConversations: 0 skipBarkIfNoValidEntries: 0 cacheBarkLines: 0 - conversation: CH02/RUINEDTOWN/HerbalistDialogue + conversation: CH02/RUINEDTOWN/WitchDialogue conversationConversant: {fileID: 1694199439} conversationActor: {fileID: 0} startConversationEntryID: 0 @@ -314242,7 +314811,7 @@ PrefabInstance: - target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4, type: 3} propertyPath: selectedToolbar - value: 4 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4, type: 3} @@ -316021,7 +316590,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 791755172} + objectReference: {fileID: 363703263} - target: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Name @@ -319308,6 +319877,450 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1819555269} m_PrefabAsset: {fileID: 0} +--- !u!1 &1820636051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1820636052} + - component: {fileID: 1820636054} + - component: {fileID: 1820636053} + - component: {fileID: 1820636056} + - component: {fileID: 1820636055} + m_Layer: 11 + m_Name: WitchHouseCrystalTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1820636052 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1820636051} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0.353883, z: 0, w: 0.93528974} + m_LocalPosition: {x: -60.497, y: 42.383, z: 143.985} + m_LocalScale: {x: 1.34, y: 1, z: 1.84} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 830642059} + m_LocalEulerAnglesHint: {x: 0, y: -41.45, z: 0} +--- !u!114 &1820636053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1820636051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} + m_Name: + m_EditorClassIdentifier: + trigger: 32 + fireOnce: 1 + condition: + luaConditions: [] + questConditions: [] + acceptedTags: + - Player + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + setQuestState: 1 + questName: + questState: 0 + setQuestEntryState: 0 + questEntryNumber: 1 + questEntryState: 0 + luaCode: + sequence: + sequenceSpeaker: {fileID: 0} + sequenceListener: {fileID: 0} + waitOneFrameOnStartOrEnable: 1 + alertMessage: + textTable: {fileID: 0} + alertDuration: 0 + sendMessages: [] + barkSource: 0 + barkConversation: + barkText: + barkTextSequence: + barker: {fileID: 0} + barkTarget: {fileID: 0} + barkOrder: 0 + allowBarksDuringConversations: 0 + skipBarkIfNoValidEntries: 0 + cacheBarkLines: 0 + conversation: CH02/RUINEDTOWN/WitchCrystal + conversationConversant: {fileID: 0} + conversationActor: {fileID: 0} + startConversationEntryID: -1 + exclusive: 0 + skipIfNoValidEntries: 0 + stopConversationOnTriggerExit: 0 + stopConversationIfTooFar: 0 + maxConversationDistance: 5 + monitorConversationDistanceFrequency: 1 + showCursorDuringConversation: 0 + pauseGameDuringConversation: 0 + setActiveActions: [] + setEnabledActions: [] + setAnimatorStateActions: [] + onExecute: + m_PersistentCalls: + m_Calls: [] + useConversationTitlePicker: 1 + useBarkTitlePicker: 1 + useQuestNamePicker: 1 + selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} +--- !u!65 &1820636054 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1820636051} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1820636055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1820636051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} + m_Name: + m_EditorClassIdentifier: + trigger: 2 + fireOnce: 1 + condition: + luaConditions: + - Variable["CH02HerbalistSpoke"] == false + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + setQuestState: 1 + questName: + questState: 0 + setQuestEntryState: 0 + questEntryNumber: 1 + questEntryState: 0 + luaCode: Variable["CH02HerbalistSpoke"] = true + sequence: + sequenceSpeaker: {fileID: 0} + sequenceListener: {fileID: 0} + waitOneFrameOnStartOrEnable: 1 + alertMessage: + textTable: {fileID: 0} + alertDuration: 0 + sendMessages: [] + barkSource: 0 + barkConversation: + barkText: + barkTextSequence: + barker: {fileID: 0} + barkTarget: {fileID: 0} + barkOrder: 0 + allowBarksDuringConversations: 0 + skipBarkIfNoValidEntries: 0 + cacheBarkLines: 0 + conversation: + conversationConversant: {fileID: 0} + conversationActor: {fileID: 0} + startConversationEntryID: -1 + exclusive: 0 + skipIfNoValidEntries: 0 + stopConversationOnTriggerExit: 0 + stopConversationIfTooFar: 0 + maxConversationDistance: 5 + monitorConversationDistanceFrequency: 1 + showCursorDuringConversation: 0 + pauseGameDuringConversation: 0 + setActiveActions: [] + setEnabledActions: [] + setAnimatorStateActions: [] + onExecute: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1367475707} + m_TargetAssemblyTypeName: QuestMachineAlertHelper, Assembly-CSharp + m_MethodName: ShowQuestMachineAlert + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Courtyard gate key received + m_BoolArgument: 0 + m_CallState: 2 + useConversationTitlePicker: 1 + useBarkTitlePicker: 1 + useQuestNamePicker: 1 + selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} +--- !u!114 &1820636056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1820636051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed2afc8944f91a9439d30e3a99739f1f, type: 3} + m_Name: + m_EditorClassIdentifier: + openCloseEvents: 0 + openCloseWindow: 0 + selectedToolbar: 4 + inputType: 0 + actionInput: + useInput: 1 + isAxisInUse: 0 + isUnityInput: 0 + keyboard: E + keyboardAxis: 0 + joystick: A + joystickAxis: 0 + mobile: A + mobileAxis: 0 + joystickAxisInvert: 0 + keyboardAxisInvert: 0 + mobileAxisInvert: 0 + timeButtonWasPressed: 0 + lastTimeTheButtonWasPressed: 0 + inButtomTimer: 0 + buttonTimer: 3 + inputDelay: 0.1 + playAnimationWhileHoldingButton: 1 + doubleButtomTime: 0.25 + actionName: Action + actionTag: Action + disableOnStart: 0 + disableCollision: 0 + disableGravity: 0 + activeFromForward: 0 + forwardAngle: 55 + useTriggerRotation: 0 + destroyAfter: 0 + destroyDelay: 0 + customCameraState: + playAnimation: + crossFadeTransition: 0.25 + animatorLayer: 0 + endActionManualy: 0 + endExitTimeAnimation: 0.8 + animatorActionState: 0 + resetAnimatorActionState: 1 + matchTarget: {fileID: 0} + avatarTarget: 0 + useLocalX: 0 + useLocalZ: 1 + matchPositionXZCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + matchPositionYCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + matchRotationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + onPressActionDelay: 0 + OnPressActionInput: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1820636053} + m_TargetAssemblyTypeName: PixelCrushers.DialogueSystem.Wrappers.DialogueSystemTrigger, + Assembly-CSharp-firstpass + m_MethodName: OnUse + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onPressActionInputWithTarget: + m_PersistentCalls: + m_Calls: [] + OnCancelActionInput: + m_PersistentCalls: + m_Calls: [] + OnFinishActionInput: + m_PersistentCalls: + m_Calls: [] + OnUpdateButtonTimer: + m_PersistentCalls: + m_Calls: [] + OnStartAnimation: + m_PersistentCalls: + m_Calls: [] + OnEndAnimation: + m_PersistentCalls: + m_Calls: [] + OnPlayerEnter: + m_PersistentCalls: + m_Calls: [] + OnPlayerStay: + m_PersistentCalls: + m_Calls: [] + OnPlayerExit: + m_PersistentCalls: + m_Calls: [] + OnValidate: + m_PersistentCalls: + m_Calls: [] + OnInvalidate: + m_PersistentCalls: + m_Calls: [] + m_questCondition: + luaConditions: [] + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + m_itemChecking: 0 + m_itemToCheckId: 0 + disableHUD: 1 + triggerType: 2 + OnPlayerMatchTargetPosition: + m_PersistentCalls: + m_Calls: [] + useFadeOnMatchingToTarget: 0 + m_fadeInCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_fadeOutCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_fadeSpeed: 2 + m_enableInteractionLegality: 0 + m_guilt: {fileID: 0} + animationDelay: 0 --- !u!1 &1820773002 stripped GameObject: m_CorrespondingSourceObject: {fileID: 927769488672062260, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, @@ -344448,171 +345461,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 919f4c6c61ceb094fb62ea8a2b6e44ba, type: 3} ---- !u!43 &1990983207 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 9.72, z: 13.65} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 9.72, z: 13.65} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1991108223 PrefabInstance: m_ObjectHideFlags: 0 @@ -345486,6 +346334,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 956c12fb96f093b4cb49668294ae9f9a, type: 3} +--- !u!21 &1995911779 +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 &1996515228 PrefabInstance: m_ObjectHideFlags: 0 @@ -353340,6 +354252,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2042439798} m_PrefabAsset: {fileID: 0} +--- !u!1 &2042575152 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3553271189056128661, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + m_PrefabInstance: {fileID: 1078730711} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2042575153 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1966043351993365815, guid: 328b55d817523634f85d1e8a144d9dd4, + type: 3} + m_PrefabInstance: {fileID: 1078730711} + m_PrefabAsset: {fileID: 0} --- !u!1 &2042870241 GameObject: m_ObjectHideFlags: 0 @@ -369279,6 +370203,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b64493b656965604b9e7eb94f190ee24, type: 3} +--- !u!43 &2125703548 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &2126000824 GameObject: m_ObjectHideFlags: 0 @@ -411289,6 +412378,24 @@ PrefabInstance: value: objectReference: {fileID: 7461429802988689633, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[97].customOutput + value: + objectReference: {fileID: 385000820370598951, guid: 5dd761199ee4b7045a10fd9b79e36026, + type: 2} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[98].customOutput + value: + objectReference: {fileID: 385000820370598951, guid: 5dd761199ee4b7045a10fd9b79e36026, + type: 2} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[99].customOutput + value: + objectReference: {fileID: 385000820370598951, guid: 5dd761199ee4b7045a10fd9b79e36026, + type: 2} - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} propertyPath: m_barks.Array.data[85].barks.Array.size @@ -411304,6 +412411,11 @@ PrefabInstance: propertyPath: m_barks.Array.data[87].barks.Array.size value: 1 objectReference: {fileID: 0} + - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_barks.Array.data[96].barks.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} propertyPath: m_barks.Array.data[97].barks.Array.size @@ -411317,7 +412429,7 @@ PrefabInstance: - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} propertyPath: m_barks.Array.data[99].barks.Array.size - value: 3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5041577070322549982, guid: b52fce9a517ed1142bb8edef5301445b, type: 3} @@ -411464,6 +412576,11 @@ PrefabInstance: propertyPath: m_Name value: BARKS objectReference: {fileID: 0} + - target: {fileID: 5532578592629425599, guid: b52fce9a517ed1142bb8edef5301445b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -439160,7 +440277,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 771685080} + - {fileID: 123331103} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -439253,7 +440370,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 934523553} + overrideMaterial: {fileID: 1995911779} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 diff --git a/Assets/Scripts/Save/ConditionalEventTrigger.cs b/Assets/Scripts/Save/ConditionalEventTrigger.cs index 2b1159afd..3406657eb 100644 --- a/Assets/Scripts/Save/ConditionalEventTrigger.cs +++ b/Assets/Scripts/Save/ConditionalEventTrigger.cs @@ -23,13 +23,15 @@ namespace Beyond [Header("Events")] [Tooltip("Actions to perform if the condition is true.")] public UnityEvent onConditionTrue; - + [Tooltip("Actions to perform if the condition is false.")] public UnityEvent onConditionFalse; // This field is used by the custom editor for the Lua wizard. [HideInInspector] public DialogueDatabase selectedDatabase = null; + [Tooltip("How often to check the condition (in seconds). If zero, only checks on start/load.")] + public float CheckInterval = 1.0f; private bool hasFired = false; @@ -40,6 +42,8 @@ namespace Beyond { base.Start(); CheckConditionAndExecute(); + if (CheckInterval > 0) + InvokeRepeating("CheckConditionAndExecute", CheckInterval + (Random.value * CheckInterval), CheckInterval); } /// diff --git a/Assets/Scripts/Utils/BarkManager.cs b/Assets/Scripts/Utils/BarkManager.cs index ad327b961..5514b6cf2 100644 --- a/Assets/Scripts/Utils/BarkManager.cs +++ b/Assets/Scripts/Utils/BarkManager.cs @@ -70,6 +70,9 @@ namespace Beyond // Ensure this namespace matches your project structure public bool IsPlaying => m_audioSource != null && m_audioSource.isPlaying; + // --- NEW: Flag to control bark playback --- + private bool m_isPaused = false; + // --- Core Methods --- public override void Awake() @@ -93,6 +96,29 @@ namespace Beyond // Ensure this namespace matches your project structure SetupAudioSource(); InitializeSaveData(); BuildConversationLookup(); + + } + + // --- NEW: Subscribe to Dialogue System events --- + private void OnEnable() + { + var dialogueSystemEvents = DialogueManager.instance.GetComponent(); + if (dialogueSystemEvents != null) + { + dialogueSystemEvents.conversationEvents.onConversationStart.AddListener(OnConversationStart); + dialogueSystemEvents.conversationEvents.onConversationEnd.AddListener(OnConversationEnd); + } + } + + // --- NEW: Unsubscribe from Dialogue System events --- + private void OnDisable() + { + var dialogueSystemEvents = DialogueManager.instance.GetComponent(); + if (dialogueSystemEvents != null) + { + dialogueSystemEvents.conversationEvents.onConversationStart.RemoveListener(OnConversationStart); + dialogueSystemEvents.conversationEvents.onConversationEnd.RemoveListener(OnConversationEnd); + } } private void SetupAudioSource() @@ -152,6 +178,9 @@ namespace Beyond // Ensure this namespace matches your project structure /// The AudioClip that will be played (or null if none/delayed). public AudioClip PlayBark(int entryIndex, Transform barkTarget = null, int specificBarkIndex = -1) { + // --- MODIFIED: Check if barks are paused --- + if (m_isPaused) return null; + if (entryIndex < 0 || entryIndex >= m_barks.Length) { Debug.LogError($"BarkManager: Invalid entryIndex {entryIndex}.", this); @@ -223,6 +252,9 @@ namespace Beyond // Ensure this namespace matches your project structure /// public void PlayBark(string conversation, Transform barkTarget = null) { + // --- MODIFIED: Check if barks are paused --- + if (m_isPaused) return; + if (m_conversationToEntry.TryGetValue(conversation, out int entryIndex)) { // Determine target *before* queuing, store null if Player isn't available/needed @@ -248,6 +280,9 @@ namespace Beyond // Ensure this namespace matches your project structure /// public void PlayBarkFromQueue(int entryIndex, Transform barkTarget = null) { + // --- MODIFIED: Check if barks are paused --- + if (m_isPaused) return; + // Queue the original target (null if default intended). Update loop will resolve Player.Instance if needed. m_barkQueue.Enqueue(new QueuedBarkRequest { entryIndex = entryIndex, target = barkTarget }); } @@ -267,6 +302,9 @@ namespace Beyond // Ensure this namespace matches your project structure /// private AudioClip PlayBarkImmediately(BarkEntry barkEntry, Transform targetForText, int specificBarkIndex = -1) { + // --- MODIFIED: Check if barks are paused --- + if (m_isPaused) return null; + if (barkEntry.barks == null || barkEntry.barks.Length == 0) return null; Bark barkToPlay = null; @@ -361,6 +399,9 @@ namespace Beyond // Ensure this namespace matches your project structure private void Update() { + // --- MODIFIED: Check if barks are paused --- + if (m_isPaused) return; + // Process the queue for externally triggered RANDOM barks if (m_barkQueue.Count > 0 && !IsPlaying) { @@ -382,5 +423,45 @@ namespace Beyond // Ensure this namespace matches your project structure PlayBark(request.entryIndex, targetForText, -1); } } + + // --- NEW: Event handlers for conversation start and end --- + private void OnConversationStart(Transform actor) + { + //PauseBarks(); + StopBarks(); + } + + private void OnConversationEnd(Transform actor) + { + //ResumeBarks(); + } + + // --- NEW: Public methods to pause and resume barks --- + public void StopBarks() + { + if (m_audioSource != null && m_audioSource.isPlaying) + { + m_audioSource.Stop(); + } + m_barkQueue.Clear(); // Clear any pending barks + } + public void PauseBarks() + { + m_isPaused = true; + if (m_audioSource != null && m_audioSource.isPlaying) + { + m_audioSource.Pause(); + } + m_barkQueue.Clear(); // Clear any pending barks + } + + public void ResumeBarks() + { + m_isPaused = false; + if (m_audioSource != null) + { + m_audioSource.UnPause(); + } + } } } \ No newline at end of file diff --git a/Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/SmokeDark.mat b/Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/SmokeDark.mat index 0d5d08ae0..9740a57b1 100644 --- a/Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/SmokeDark.mat +++ b/Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/SmokeDark.mat @@ -130,7 +130,7 @@ Material: - _BaseColor: {r: 1, g: 0.524691, b: 0.07075471, a: 0.48235294} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 1, g: 0.524691, b: 0.070754685, a: 0.48235294} + - _Color: {r: 1, g: 0.5246909, b: 0.070754685, a: 0.48235294} - _EmisColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.030037379, g: 0.045851335, b: 0.14150941, a: 1} - _SoftParticleFadeParams: {r: 0, g: 1, b: 0, a: 0}