diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset index 9b5f57d9b..41f2b84ab 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset @@ -933,6 +933,48 @@ MonoBehaviour: value: type: 0 typeString: CustomFieldType_Text + - id: 23 + fields: + - title: Name + value: CH02PosionGlandCollected + type: 0 + typeString: CustomFieldType_Text + - title: Initial Value + value: False + type: 2 + typeString: CustomFieldType_Boolean + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - id: 24 + fields: + - title: Name + value: CH02KeyReceived + type: 0 + typeString: CustomFieldType_Text + - title: Initial Value + value: False + type: 2 + typeString: CustomFieldType_Boolean + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - id: 25 + fields: + - title: Name + value: CH02CrystalReceived + 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: @@ -27629,7 +27671,7 @@ MonoBehaviour: conditionPriority: 2 outgoingLinks: [] conditionsString: - userScript: Variable["CH02HerbalistSpoke"] = true + userScript: onExecute: m_PersistentCalls: m_Calls: [] @@ -27639,8 +27681,8 @@ MonoBehaviour: y: 341.37122 width: 160 height: 30 - canvasScrollPosition: {x: 54.582294, y: 15.388398} - canvasZoom: 1.0820013 + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 1.0700026 - id: 109 fields: - title: Title @@ -32577,6 +32619,12 @@ MonoBehaviour: destinationDialogueID: 1 isConnector: 0 priority: 2 + - originConversationID: 133 + originDialogueID: 0 + destinationConversationID: 133 + destinationDialogueID: 5 + isConnector: 0 + priority: 2 conditionsString: userScript: onExecute: @@ -32632,7 +32680,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Altar/CH02_vo_crystal_wonderer_01) + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Altar with a crystal/CH02_vo_crystal_wonderer_01) type: 0 typeString: CustomFieldType_Text - title: pl @@ -32653,15 +32701,15 @@ MonoBehaviour: destinationDialogueID: 2 isConnector: 0 priority: 2 - conditionsString: + conditionsString: Variable["CH02PosionGlandCollected"] == false userScript: onExecute: m_PersistentCalls: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 - y: 80 + x: 21 + y: 102 width: 160 height: 30 - id: 2 @@ -32709,7 +32757,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Altar/CH02_vo_crystal_zora_01) + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Altar with a crystal/CH02_vo_crystal_zora_01) type: 0 typeString: CustomFieldType_Text - title: pl @@ -32737,8 +32785,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 - y: 130 + x: 14 + y: 227 width: 160 height: 30 - id: 3 @@ -32785,7 +32833,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Altar/CH02_vo_crystal_wonderer_02) + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Altar with a crystal/CH02_vo_crystal_wonderer_02) type: 0 typeString: CustomFieldType_Text - title: pl @@ -32813,8 +32861,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 - y: 180 + x: 15 + y: 275 width: 160 height: 30 - id: 4 @@ -32862,7 +32910,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Altar/CH02_vo_crystal_zora_02) + value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Altar with a crystal/CH02_vo_crystal_zora_02) type: 0 typeString: CustomFieldType_Text - title: pl @@ -32884,8 +32932,309 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 - y: 230 + x: 15 + y: 325 + width: 160 + height: 30 + - id: 5 + 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: Give it here! Yes, this will do, this will do nicely, right, my starlight...? + This will make them remember us. Remember 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: + 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: 5 + destinationConversationID: 133 + destinationDialogueID: 6 + isConnector: 0 + priority: 2 + conditionsString: Variable["CH02PosionGlandCollected"] == true + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 233 + y: 79 + width: 160 + height: 30 + - id: 6 + 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: 'You, what are you waiting for? Get your crystal, and get out of my + home, out of my memory, out of our lives! ' + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 133 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 133 + originDialogueID: 6 + destinationConversationID: 133 + destinationDialogueID: 7 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 233 + y: 129 + 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: 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: Thank you, Zora. I will return for you one day. This I promise. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 133 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 133 + originDialogueID: 7 + destinationConversationID: 133 + destinationDialogueID: 8 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 237 + y: 197 + 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: 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: 'Look around us. Do you see any splendor outside? Any palaces or towers + or gardens bearing the sigil of Lady Zora the Wise? + + This is + what all the promises are worth. Dreams and illusions. He promised me so + much... And the price was too high... He promised me... He promised...' + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 133 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 237 + y: 265 width: 160 height: 30 canvasScrollPosition: {x: 0, y: 0} diff --git a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta index c1ffd5637..0ecf10fcd 100644 --- a/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta +++ b/Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 227762e2f34f94c39886be6c601c46f6 +guid: d63770b2abbfd4dac9512f8f548398b2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Dialogue/TestDialogueBase.asset b/Assets/Dialogue/TestDialogueBase.asset index 41bcffaff..0c91b3b46 100644 --- a/Assets/Dialogue/TestDialogueBase.asset +++ b/Assets/Dialogue/TestDialogueBase.asset @@ -623,6 +623,44 @@ MonoBehaviour: value: False type: 2 typeString: CustomFieldType_Boolean + - id: 26 + fields: + - title: Name + value: CH02WitchHouse + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Success Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Failure Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: State + value: unassigned + type: 0 + typeString: CustomFieldType_QuestState + - title: Is Item + value: False + type: 2 + typeString: CustomFieldType_Boolean + - title: Name pl + value: + type: 4 + typeString: CustomFieldType_Localization + - title: Description pl + value: + type: 4 + typeString: CustomFieldType_Localization locations: [] variables: - id: 1 diff --git a/Assets/Quests/CH02/CH02WitchHouse.asset b/Assets/Quests/CH02/CH02WitchHouse.asset index 27f7dbf84..d2820f237 100644 --- a/Assets/Quests/CH02/CH02WitchHouse.asset +++ b/Assets/Quests/CH02/CH02WitchHouse.asset @@ -59,26 +59,6 @@ MonoBehaviour: m_valueType: 0 m_intValue: 0 m_stringValue: ---- !u!114 &-8653979122806494159 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c47e1bb9cdd9a474c8d3f5d555d7533a, type: 3} - m_Name: HeadingTextQuestContent - m_EditorClassIdentifier: - m_contentID: -1 - m_useQuestTitle: 0 - m_headingText: - m_text: Xasarath defeated - m_stringAsset: {fileID: 0} - m_textTable: {fileID: 0} - m_textTableFieldID: 0 - m_headingLevel: 1 --- !u!114 &-8578796476092519750 MonoBehaviour: m_ObjectHideFlags: 1 @@ -138,6 +118,33 @@ MonoBehaviour: m_textTable: {fileID: 0} m_textTableFieldID: 0 m_headingLevel: 1 +--- !u!114 &-7841232632897984608 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9840a28297a53d449903f34dc60157bb, type: 3} + m_Name: UnityEventQuestAction + m_EditorClassIdentifier: + m_onExecute: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &-7446036202664288738 MonoBehaviour: m_ObjectHideFlags: 1 @@ -322,6 +329,24 @@ MonoBehaviour: m_textTable: {fileID: 0} m_textTableFieldID: 0 m_headingLevel: 1 +--- !u!114 &-3388674572673871474 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8dd425597ce38647ade6025cfd66c5e, type: 3} + m_Name: ActivateGameObjectQuestAction + m_EditorClassIdentifier: + m_gameObjectName: + m_text: Destination_Target_MetalGate + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_state: 0 --- !u!114 &-2505829491228229992 MonoBehaviour: m_ObjectHideFlags: 1 @@ -630,6 +655,7 @@ MonoBehaviour: - m_contentList: [] - m_actionList: - {fileID: 3367981398650340145} + - {fileID: -7841232632897984608} m_categorizedContentList: - m_contentList: [] - m_contentList: [] @@ -680,12 +706,15 @@ MonoBehaviour: - m_actionList: - {fileID: 2915134757682194737} - {fileID: -1625373378929022548} + - {fileID: 2176576428009084007} m_categorizedContentList: - m_contentList: [] - m_contentList: [] - m_contentList: - {fileID: -74462918815286381} - - m_actionList: [] + - m_actionList: + - {fileID: 3522696309081964476} + - {fileID: -3388674572673871474} m_categorizedContentList: - m_contentList: [] - m_contentList: [] @@ -736,7 +765,6 @@ MonoBehaviour: - {fileID: -8341222452620954764} - m_actionList: - {fileID: 8741718913370622239} - - {fileID: 1646647759270838919} m_categorizedContentList: - m_contentList: [] - m_contentList: [] @@ -836,7 +864,8 @@ MonoBehaviour: - m_contentList: [] - m_contentList: - {fileID: -1941475915782848472} - - m_actionList: [] + - m_actionList: + - {fileID: 7751196241427541844} m_categorizedContentList: - m_contentList: [] - m_contentList: [] @@ -1167,7 +1196,7 @@ MonoBehaviour: m_valueType: 0 m_intValue: 0 m_stringValue: ---- !u!114 &1646647759270838919 +--- !u!114 &2176576428009084007 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -1176,12 +1205,15 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b99cc2a156c22e46b4fb74b06a4d1e8, type: 3} - m_Name: AlertQuestAction + m_Script: {fileID: 11500000, guid: d8dd425597ce38647ade6025cfd66c5e, type: 3} + m_Name: ActivateGameObjectQuestAction m_EditorClassIdentifier: - m_contentList: - - {fileID: -8653979122806494159} - m_contentListSerializationProxy: [] + m_gameObjectName: + m_text: Destination_Target_MetalGate + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_state: 1 --- !u!114 &2243021536323710742 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1240,6 +1272,19 @@ MonoBehaviour: m_contentList: - {fileID: -6189065307398835676} m_contentListSerializationProxy: [] +--- !u!114 &3522696309081964476 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c94e8fb3b9b54114cbe8185003729c1b, type: 3} + m_Name: SceneEventQuestAction + m_EditorClassIdentifier: + m_guid: --- !u!114 &3725813361027539405 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1359,6 +1404,24 @@ MonoBehaviour: m_textTable: {fileID: 0} m_textTableFieldID: 0 m_headingLevel: 1 +--- !u!114 &7751196241427541844 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8dd425597ce38647ade6025cfd66c5e, type: 3} + m_Name: ActivateGameObjectQuestAction + m_EditorClassIdentifier: + m_gameObjectName: + m_text: IllusionaryWallTrigger + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_state: 0 --- !u!114 &8332098773891880592 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity index c526fe590..a74652ed9 100644 --- a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity +++ b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity @@ -6185,7 +6185,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1979377141} + objectReference: {fileID: 854517703} - target: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Name @@ -17050,7 +17050,8 @@ Transform: m_LocalPosition: {x: -60.497, y: 42.383, z: 143.985} m_LocalScale: {x: 1.34, y: 1, z: 1.8400002} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 169331789} m_Father: {fileID: 503929320} m_LocalEulerAnglesHint: {x: 0, y: -41.45, z: 0} --- !u!114 &110971710 @@ -18823,6 +18824,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1260418001} + - {fileID: 1687236622} - {fileID: 1221005342} - {fileID: 281586853} - {fileID: 36633288} @@ -18832,7 +18834,6 @@ Transform: - {fileID: 2065487027} - {fileID: 2131406573} - {fileID: 426200879} - - {fileID: 1687236622} - {fileID: 1705785289} - {fileID: 2080588056} - {fileID: 1640507656} @@ -19530,7 +19531,7 @@ GameObject: - component: {fileID: 125138634} - component: {fileID: 125138633} m_Layer: 0 - m_Name: Barier + m_Name: IllusionaryWall m_TagString: Untagged m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 @@ -26839,6 +26840,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 167465740} m_PrefabAsset: {fileID: 0} +--- !u!4 &169331789 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + m_PrefabInstance: {fileID: 1640239464} + m_PrefabAsset: {fileID: 0} --- !u!1001 &169437222 PrefabInstance: m_ObjectHideFlags: 0 @@ -45563,171 +45570,6 @@ Transform: m_Children: [] m_Father: {fileID: 99479629} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &300877065 -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 &301096711 GameObject: m_ObjectHideFlags: 0 @@ -73789,6 +73631,39 @@ MonoBehaviour: _disableOnStart: 0 _useDistanceFade: 0 _fadeRange: 5 +--- !u!21 &498841117 +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 &498914592 PrefabInstance: m_ObjectHideFlags: 0 @@ -74715,6 +74590,7 @@ MonoBehaviour: condition: luaConditions: - Variable["CH02KeyReceived"] == false + - CurrentQuestState("CH02WitchHouse") == "active" questConditions: [] acceptedTags: [] acceptedGameObjects: [] @@ -129274,6 +129150,125 @@ Transform: type: 3} m_PrefabInstance: {fileID: 774562220} m_PrefabAsset: {fileID: 0} +--- !u!1001 &775188945 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1820636052} + m_Modifications: + - target: {fileID: 591139192970829400, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 591139192970829400, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_Size.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 591139192970829400, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_Size.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3048007801992982467, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: nextPoint + value: + objectReference: {fileID: 0} + - target: {fileID: 3048007801992982467, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: activateOnStart + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3048007801992982467, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: triggerCollider + value: + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalScale.x + value: 0.55038995 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalScale.y + value: 0.99486697 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalScale.z + value: 0.7364059 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7904806056883271770, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_Name + value: Destination_Target_Crystal_Nokey + objectReference: {fileID: 0} + - target: {fileID: 7904806056883271770, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 591139192970829400, guid: ab3ff33ef33104072b03989292f6a0c4, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab3ff33ef33104072b03989292f6a0c4, type: 3} --- !u!4 &775411646 stripped Transform: m_CorrespondingSourceObject: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, @@ -136205,6 +136200,7 @@ Transform: - {fileID: 1223287650} - {fileID: 657758459} - {fileID: 503929320} + - {fileID: 991163652} - {fileID: 1603726903} - {fileID: 1905145261} m_Father: {fileID: 0} @@ -139504,6 +139500,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 854468024} m_PrefabAsset: {fileID: 0} +--- !u!43 &854517703 +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 &855160596 PrefabInstance: m_ObjectHideFlags: 0 @@ -141736,6 +141897,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 872067395} m_PrefabAsset: {fileID: 0} +--- !u!43 &873758005 +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 &873995927 PrefabInstance: m_ObjectHideFlags: 0 @@ -145613,171 +145939,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 902430915} m_PrefabAsset: {fileID: 0} ---- !u!43 &902457047 -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 &903104712 PrefabInstance: m_ObjectHideFlags: 0 @@ -153520,6 +153681,10 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - guid: d40c4069-16c3-40dc-8504-80227368be20 + onExecute: + m_PersistentCalls: + m_Calls: [] --- !u!4 &954829388 Transform: m_ObjectHideFlags: 0 @@ -158660,6 +158825,97 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a41bdcbd4d2237d4ea1158ba8f08c293, type: 3} +--- !u!1 &991163651 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 991163652} + - component: {fileID: 991163653} + m_Layer: 0 + m_Name: IllusionaryWall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &991163652 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 991163651} + 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: + - {fileID: 1764184318} + m_Father: {fileID: 830642059} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &991163653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 991163651} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6709a146e599d4c46882e1173a52b192, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + condition: + luaConditions: + - CurrentQuestState("CH02WitchHouse") == "active" + - Variable["CH02CrystalReceived"] == true + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + fireOnce: 1 + onConditionTrue: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1764184317} + 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: + - m_Target: {fileID: 1764184317} + 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 + selectedDatabase: {fileID: 0} + CheckInterval: 1 --- !u!4 &991198253 stripped Transform: m_CorrespondingSourceObject: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, @@ -162686,70 +162942,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da4a586b899df9a4aa24f4ef40304970, type: 3} ---- !u!21 &1004889254 -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!4 &1005322341 stripped Transform: m_CorrespondingSourceObject: {fileID: 4004706782228009551, guid: 5c6a68f0e5ee55c45a0856c1dcd95bac, @@ -183587,6 +183779,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b5a63866acfb2e547ab2d5fd34950804, type: 3} +--- !u!21 &1170496527 +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 &1171252271 PrefabInstance: m_ObjectHideFlags: 0 @@ -228434,39 +228690,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1518881450} m_PrefabAsset: {fileID: 0} ---- !u!21 &1519070957 -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!1 &1520784544 GameObject: m_ObjectHideFlags: 0 @@ -235539,6 +235762,125 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1572672879} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1573006126 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1687236622} + m_Modifications: + - target: {fileID: 591139192970829400, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 591139192970829400, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_Size.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 591139192970829400, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_Size.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3048007801992982467, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: nextPoint + value: + objectReference: {fileID: 0} + - target: {fileID: 3048007801992982467, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: activateOnStart + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalScale.x + value: 0.13263191 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalScale.y + value: 0.084730394 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalScale.z + value: 0.28624636 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalPosition.x + value: -72.60723 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.35204208 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalPosition.z + value: -16.346027 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5338039 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.026763057 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.84454453 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.032888994 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 1.546 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 37.549 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -4.609 + objectReference: {fileID: 0} + - target: {fileID: 7904806056883271770, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_Name + value: Destination_Target_MetalGate + objectReference: {fileID: 0} + - target: {fileID: 7904806056883271770, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab3ff33ef33104072b03989292f6a0c4, type: 3} +--- !u!4 &1573006127 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + m_PrefabInstance: {fileID: 1573006126} + m_PrefabAsset: {fileID: 0} --- !u!4 &1573293792 stripped Transform: m_CorrespondingSourceObject: {fileID: 5885080229389037690, guid: 3ef32dcb7e900c245b48572d43b140b4, @@ -245220,6 +245562,119 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1371728558} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1640239464 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 110971709} + m_Modifications: + - target: {fileID: 591139192970829400, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 591139192970829400, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_Size.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 591139192970829400, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_Size.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3048007801992982467, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: nextPoint + value: + objectReference: {fileID: 0} + - target: {fileID: 3048007801992982467, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: activateOnStart + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalScale.x + value: 0.55039 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalScale.y + value: 0.99486697 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalScale.z + value: 0.73640597 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7904806056883271770, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_Name + value: Destination_Target_Crystal_PoisonGland + objectReference: {fileID: 0} + - target: {fileID: 7904806056883271770, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab3ff33ef33104072b03989292f6a0c4, type: 3} --- !u!1001 &1640288433 PrefabInstance: m_ObjectHideFlags: 0 @@ -246105,6 +246560,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1646845367} m_PrefabAsset: {fileID: 0} +--- !u!4 &1647768048 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5725584778122593897, guid: ab3ff33ef33104072b03989292f6a0c4, + type: 3} + m_PrefabInstance: {fileID: 775188945} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1649624131 PrefabInstance: m_ObjectHideFlags: 0 @@ -253877,7 +254338,11 @@ PrefabInstance: m_RemovedComponents: - {fileID: 1956333636531337151, guid: 0721cb7ee4dc95943a7f84d517fe6c49, type: 3} m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1956333636531337091, guid: 0721cb7ee4dc95943a7f84d517fe6c49, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1573006127} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 1956333636531337150, guid: 0721cb7ee4dc95943a7f84d517fe6c49, type: 3} @@ -318908,6 +319373,473 @@ Transform: type: 3} m_PrefabInstance: {fileID: 438699977} m_PrefabAsset: {fileID: 0} +--- !u!1 &1764184317 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1764184318} + - component: {fileID: 1764184323} + - component: {fileID: 1764184322} + - component: {fileID: 1764184321} + - component: {fileID: 1764184320} + - component: {fileID: 1764184319} + m_Layer: 11 + m_Name: IllusionaryWallTrigger + m_TagString: Untagged + m_Icon: {fileID: 2800000, guid: b1a615fdf6bd20940a59c9cf8671316d, type: 3} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1764184318 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1764184317} + serializedVersion: 2 + m_LocalRotation: {x: -0.66132253, y: 0.255861, z: 0.2575352, w: 0.65640175} + m_LocalPosition: {x: -6.3310003, y: 39.36, z: 180.187} + m_LocalScale: {x: 4, y: 2.0099998, z: 7.2099996} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 991163652} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1764184319 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1764184317} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d18230d3a29b2a418e94d126c53f276, type: 3} + m_Name: + m_EditorClassIdentifier: + m_questID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_questNodeID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_counterName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_conditionalEvent: + questID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + requiredQuestState: 0 + questNodeID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + requiredQuestNodeState: 0 + onConditionMet: + m_PersistentCalls: + m_Calls: [] +--- !u!82 &1764184320 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1764184317} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1764184321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1764184317} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b50edffd47b523f4d81c54b1ecb90e19, type: 3} + m_Name: + m_EditorClassIdentifier: + nextPoint: {fileID: 0} + triggerCollider: {fileID: 0} + destinationSound: {fileID: 8300000, guid: c5617f7e5e957f34dae3a4390bfdf826, type: 3} + audioSource: {fileID: 1764184320} + onTriggerEnter: + m_PersistentCalls: + m_Calls: [] + activateOnStart: 1 + switchOnParentDeactivation: 0 +--- !u!114 &1764184322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1764184317} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed2afc8944f91a9439d30e3a99739f1f, type: 3} + m_Name: + m_EditorClassIdentifier: + openCloseEvents: 0 + openCloseWindow: 0 + selectedToolbar: 5 + 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: 1 + 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: 125138631} + 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: 1764184321} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + 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!65 &1764184323 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1764184317} + 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 &1764635084 PrefabInstance: m_ObjectHideFlags: 0 @@ -323167,7 +324099,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1921550275} + objectReference: {fileID: 1881999757} - target: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Name @@ -326672,7 +327604,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1820636052 Transform: m_ObjectHideFlags: 0 @@ -326685,7 +327617,8 @@ Transform: m_LocalPosition: {x: -60.497, y: 42.383, z: 143.985} m_LocalScale: {x: 1.34, y: 1, z: 1.8400002} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1647768048} m_Father: {fileID: 503929320} m_LocalEulerAnglesHint: {x: 0, y: -41.45, z: 0} --- !u!114 &1820636053 @@ -335212,6 +336145,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1881972194} m_PrefabAsset: {fileID: 0} +--- !u!43 &1881999757 +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 &1882878047 stripped Transform: m_CorrespondingSourceObject: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, @@ -342245,171 +343343,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1920885588} m_PrefabAsset: {fileID: 0} ---- !u!43 &1921550275 -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 &1923571749 stripped Transform: m_CorrespondingSourceObject: {fileID: 5850431634514543666, guid: bd68abf0787eb0c4abff82717c1a4b1a, @@ -350909,171 +351842,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b45831cf4c41f8a4faf5cfda751c7407, type: 3} ---- !u!43 &1979377141 -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 &1979430159 PrefabInstance: m_ObjectHideFlags: 0 @@ -378970,6 +379738,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2b70fedf993c12469ae1554983e5841, type: 3} +--- !u!43 &2130702026 +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 &2131406572 PrefabInstance: m_ObjectHideFlags: 0 @@ -448366,7 +449299,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1519070957} + - {fileID: 498841117} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -448459,7 +449392,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 1004889254} + overrideMaterial: {fileID: 1170496527} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 diff --git a/Assets/Scripts/InvectorDerivatives/bTriggerGenericAction.cs b/Assets/Scripts/InvectorDerivatives/bTriggerGenericAction.cs index 40327f82d..016770e2a 100644 --- a/Assets/Scripts/InvectorDerivatives/bTriggerGenericAction.cs +++ b/Assets/Scripts/InvectorDerivatives/bTriggerGenericAction.cs @@ -9,189 +9,185 @@ using Sirenix.OdinInspector; using PixelCrushers.QuestMachine; using PixelCrushers.DialogueSystem; using TMPro; - namespace Beyond { - [vClassHeader("bTrigger Generic Action", false, iconName = "triggerIcon")] - public class bTriggerGenericAction : vTriggerGenericAction +[vClassHeader("bTrigger Generic Action", false, iconName = "triggerIcon")] +public class bTriggerGenericAction : vTriggerGenericAction +{ + [vEditorToolbar("Conditions", order = 0)] [SerializeField] + private Condition m_questCondition; + public bool m_itemChecking; + public int m_itemToCheckId; + + [vHelpBox("Disable Selected HUD OnValidate, and enable OnInvalidate. Script ActionTriggerEvent.cs")] + public bool disableHUD = true; + + [vHelpBox("Changes interaction image")] + //public bool isDialogueTrigger = false; + + public TriggerDescriptor.TriggerType triggerType = TriggerDescriptor.TriggerType.Generic; + + public UnityEvent OnPlayerMatchTargetPosition; + + [vEditorToolbar("Animation", order = 2)] [SerializeField] + public bool useFadeOnMatchingToTarget; + + [SerializeField] private AnimationCurve m_fadeInCurve; + [SerializeField] private AnimationCurve m_fadeOutCurve; + [SerializeField] private float m_fadeSpeed = 2f; + + [vEditorToolbar("Interaction", order = 4)] [SerializeField] + private bool m_enableInteractionLegality; + + public Quest m_guilt; + + private bool m_faded; + public bool Faded => m_faded; + + public float animationDelay = 0f; + private TriggerDescriptor m_triggerDescriptor; + + private void OnEnable() { - [vEditorToolbar("Conditions", order = 0)] [SerializeField] - private Condition m_questCondition; - - public bool m_itemChecking; - public int m_itemToCheckId; - - [vHelpBox("Disable Selected HUD OnValidate, and enable OnInvalidate. Script ActionTriggerEvent.cs")] - public bool disableHUD = true; - - [vHelpBox("Changes interaction image")] - public TriggerDescriptor.TriggerType triggerType = TriggerDescriptor.TriggerType.Generic; - - public UnityEvent OnPlayerMatchTargetPosition; - - [vEditorToolbar("Animation", order = 2)] [SerializeField] - public bool useFadeOnMatchingToTarget; - - [SerializeField] private AnimationCurve m_fadeInCurve; - [SerializeField] private AnimationCurve m_fadeOutCurve; - [SerializeField] private float m_fadeSpeed = 2f; - - [vEditorToolbar("Interaction", order = 4)] [SerializeField] - private bool m_enableInteractionLegality; - - public Quest m_guilt; - - private bool m_faded; - public bool Faded => m_faded; - - public float animationDelay = 0f; - private TriggerDescriptor m_triggerDescriptor; - - private void OnEnable() + if (useFadeOnMatchingToTarget) { - if (useFadeOnMatchingToTarget) + OnPressActionInput.AddListener(ToggleFade); + OnPlayerMatchTargetPosition.AddListener(ToggleFade); + if (FadeCanvasGroup.Instance) { - OnPressActionInput.AddListener(ToggleFade); - OnPlayerMatchTargetPosition.AddListener(ToggleFade); - if (FadeCanvasGroup.Instance) - { - FadeCanvasGroup.Instance.OnFadeInEnd.AddListener(OnFadeInEnd); - FadeCanvasGroup.Instance.OnFadeOutEnd.AddListener(OnFadeOutEnd); - } + FadeCanvasGroup.Instance.OnFadeInEnd.AddListener(OnFadeInEnd); + FadeCanvasGroup.Instance.OnFadeOutEnd.AddListener(OnFadeOutEnd); } } - - private void OnDisable() - { - if (useFadeOnMatchingToTarget) - { - OnPressActionInput.RemoveListener(ToggleFade); - OnPlayerMatchTargetPosition.RemoveListener(ToggleFade); - if (FadeCanvasGroup.Instance) - { - FadeCanvasGroup.Instance.OnFadeInEnd.RemoveListener(OnFadeInEnd); - FadeCanvasGroup.Instance.OnFadeOutEnd.RemoveListener(OnFadeOutEnd); - } - } - } - - public override IEnumerator OnPressActionDelay(GameObject obj) - { - if (!m_itemChecking) - { - yield return base.OnPressActionDelay(obj); - } - - if (m_itemChecking && Player.Instance.ItemManager.ContainItem(m_itemToCheckId)) - { - yield return base.OnPressActionDelay(obj); - } - - - if (!Player.Instance.ItemManager.ContainItem(m_itemToCheckId)) - { - var item = Player.Instance.ItemManager.itemListData.items.Find(item => item.id == m_itemToCheckId); - DialogueManager.BarkString($"{item.name} Required", Player.Instance.transform); - } - } - - private void OnActionTriggerEnter(GameObject gameObject) - { - if (!m_questCondition.IsTrue(null)) - { - return; - } - - if (disableHUD) - { - ActionTriggerEvent.ActionTriggerEnter?.Invoke(m_triggerDescriptor); - } - - if (triggerType == TriggerDescriptor.TriggerType.Dialogue) - { - Player.Instance.SetDialogueIntaractableButtonImage(); - } - } - - private void OnActionTriggerExit(GameObject gameObject) - { - if (disableHUD) - { - ActionTriggerEvent.ActionTriggerExit?.Invoke(m_triggerDescriptor); - } - - if (triggerType == TriggerDescriptor.TriggerType.Dialogue) - { - Player.Instance.ResetIntaractableButtonImage(); - } - } - - private void OnActionEndAnimation(GameObject gameObject) - { - // THIS SECTION WAS THE PRIMARY CAUSE OF THE DOUBLE-EXIT CALL. - // The logic below was removed because the trigger exit should only happen - // when the player physically leaves the collider, which is already - // handled by the OnInvalidate event that calls OnActionTriggerExit. - /* - if (disableHUD) - { - ActionTriggerEvent.ActionTriggerExit?.Invoke(m_triggerDescriptor); - } - - if (triggerType == TriggerDescriptor.TriggerType.Dialogue) - { - Player.Instance.ResetIntaractableButtonImage(); - } - */ - - if (!m_enableInteractionLegality) - { - return; - } - - if (m_guilt == null) - { - Debug.LogError("There is no quilt assigned to interactable game object: " + gameObject.name); - return; - } - - Player.Instance.PlayerConfessionController.AddGuilt(m_guilt); - } - - private void ToggleFade() - { - if (FadeCanvasGroup.Instance == null) - { - return; - } - - if (!m_faded) - { - m_faded = true; - FadeCanvasGroup.Instance.FadeOut(1f / m_fadeSpeed); - return; - } - - FadeCanvasGroup.Instance.FadeIn(1f / m_fadeSpeed); - } - - private void OnFadeInEnd() - { - m_faded = false; - } - - private void OnFadeOutEnd() - { - m_faded = true; - } - - protected override void Start() - { - base.Start(); - m_triggerDescriptor = new TriggerDescriptor(gameObject, triggerType); - OnValidate.AddListener(OnActionTriggerEnter); - OnInvalidate.AddListener(OnActionTriggerExit); - OnEndAnimation.AddListener(() => OnActionEndAnimation(gameObject)); - } } -} \ No newline at end of file + + private void OnDisable() + { + if (useFadeOnMatchingToTarget) + { + OnPressActionInput.RemoveListener(ToggleFade); + OnPlayerMatchTargetPosition.RemoveListener(ToggleFade); + if (FadeCanvasGroup.Instance) + { + FadeCanvasGroup.Instance.OnFadeInEnd.RemoveListener(OnFadeInEnd); + FadeCanvasGroup.Instance.OnFadeOutEnd.RemoveListener(OnFadeOutEnd); + } + } + } + + public override IEnumerator OnPressActionDelay(GameObject obj) + { + if (!m_itemChecking) + { + yield return base.OnPressActionDelay(obj); + } + + if (m_itemChecking && Player.Instance.ItemManager.ContainItem(m_itemToCheckId)) + { + yield return base.OnPressActionDelay(obj); + } + + + if (!Player.Instance.ItemManager.ContainItem(m_itemToCheckId)) + { + var item = Player.Instance.ItemManager.itemListData.items.Find(item => item.id == m_itemToCheckId); + DialogueManager.BarkString($"{item.name} Required", Player.Instance.transform); + } + } + + private void OnActionTriggerEnter(GameObject gameObject) + { + if (!m_questCondition.IsTrue(null)) + { + return; + } + + if (disableHUD) + { + ActionTriggerEvent.ActionTriggerEnter?.Invoke(m_triggerDescriptor); + } + + if (triggerType == TriggerDescriptor.TriggerType.Dialogue) + { + Player.Instance.SetDialogueIntaractableButtonImage(); + } + } + + private void OnActionTriggerExit(GameObject gameObject) + { + if (disableHUD) + { + ActionTriggerEvent.ActionTriggerExit?.Invoke(m_triggerDescriptor); + } + + if (triggerType == TriggerDescriptor.TriggerType.Dialogue) + { + Player.Instance.ResetIntaractableButtonImage(); + } + } + + private void OnActionEndAnimation(GameObject gameObject) + { + if (disableHUD) + { + ActionTriggerEvent.ActionTriggerExit?.Invoke(m_triggerDescriptor); + } + + if (triggerType == TriggerDescriptor.TriggerType.Dialogue) + { + Player.Instance.ResetIntaractableButtonImage(); + } + + if (!m_enableInteractionLegality) + { + return; + } + + if (m_guilt == null) + { + Debug.LogError("There is no quilt assigned to interactable game object: " + gameObject.name); + return; + } + + Player.Instance.PlayerConfessionController.AddGuilt(m_guilt); + } + + private void ToggleFade() + { + if (FadeCanvasGroup.Instance == null) + { + return; + } + + if (!m_faded) + { + m_faded = true; + FadeCanvasGroup.Instance.FadeOut(1f / m_fadeSpeed); + //.InvokeFade(m_fadeInCurve, m_fadeSpeed); + return; + } + + FadeCanvasGroup.Instance.FadeIn(1f / m_fadeSpeed); + //FadeCanvasGroup.InvokeFade(m_fadeOutCurve, m_fadeSpeed); + } + + private void OnFadeInEnd() + { + m_faded = false; + } + + private void OnFadeOutEnd() + { + m_faded = true; + } + + protected override void Start() + { + base.Start(); + m_triggerDescriptor = new TriggerDescriptor(gameObject, triggerType); + OnValidate.AddListener(OnActionTriggerEnter); + OnInvalidate.AddListener(OnActionTriggerExit); + OnEndAnimation.AddListener(() => OnActionEndAnimation(gameObject)); + } +} +}