From 249317a49c543903b5bd79b2d6f342e4398cbb78 Mon Sep 17 00:00:00 2001 From: marcin Date: Thu, 23 Oct 2025 12:06:43 +0200 Subject: [PATCH] quest progression on ruined town --- Assets/Dialogue/TestDialogueBase.asset | 26 +- Assets/Quests/BeyondQuestDatabase.asset | 2 + Assets/Quests/CH02/CH02Main.asset | 88 +-- .../Scenes/02_Ruined_Town/Ruined_Town.unity | 724 +++++++++++++++--- 4 files changed, 623 insertions(+), 217 deletions(-) diff --git a/Assets/Dialogue/TestDialogueBase.asset b/Assets/Dialogue/TestDialogueBase.asset index b77ea6611..41bcffaff 100644 --- a/Assets/Dialogue/TestDialogueBase.asset +++ b/Assets/Dialogue/TestDialogueBase.asset @@ -27681,7 +27681,7 @@ MonoBehaviour: y: 341.37122 width: 160 height: 30 - canvasScrollPosition: {x: 51.08965, y: 11.149542} + canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1.0700026 - id: 109 fields: @@ -32680,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 @@ -32708,8 +32708,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 - y: 80 + x: 21 + y: 102 width: 160 height: 30 - id: 2 @@ -32757,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 @@ -32785,8 +32785,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 - y: 130 + x: 14 + y: 227 width: 160 height: 30 - id: 3 @@ -32833,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 @@ -32861,8 +32861,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 - y: 180 + x: 15 + y: 275 width: 160 height: 30 - id: 4 @@ -32910,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 @@ -32932,8 +32932,8 @@ MonoBehaviour: m_Calls: [] canvasRect: serializedVersion: 2 - x: 20 - y: 230 + x: 15 + y: 325 width: 160 height: 30 - id: 5 diff --git a/Assets/Quests/BeyondQuestDatabase.asset b/Assets/Quests/BeyondQuestDatabase.asset index 4c4424fa0..1878f3953 100644 --- a/Assets/Quests/BeyondQuestDatabase.asset +++ b/Assets/Quests/BeyondQuestDatabase.asset @@ -32,4 +32,6 @@ MonoBehaviour: - {fileID: 11400000, guid: 81684a7c39cc54450bc167e203dda4c0, type: 2} - {fileID: 11400000, guid: 43363ea5afe3d426b8e2e25dd2cca7d5, type: 2} - {fileID: 11400000, guid: 7c05893494c66451e840480ab09a9eb3, type: 2} + - {fileID: 11400000, guid: 0dfd59083a0b1413393df1f5c94dad8d, type: 2} + - {fileID: 11400000, guid: b7097c4b7bc544de2b329f98e16c72e4, type: 2} m_images: [] diff --git a/Assets/Quests/CH02/CH02Main.asset b/Assets/Quests/CH02/CH02Main.asset index 0c3781087..a2997ea24 100644 --- a/Assets/Quests/CH02/CH02Main.asset +++ b/Assets/Quests/CH02/CH02Main.asset @@ -53,21 +53,6 @@ MonoBehaviour: m_textTable: {fileID: 0} m_textTableFieldID: 0 m_headingLevel: 1 ---- !u!114 &-7499910049501382128 -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: 6b99cc2a156c22e46b4fb74b06a4d1e8, type: 3} - m_Name: AlertQuestAction - m_EditorClassIdentifier: - m_contentList: - - {fileID: 3763760843002708439} - m_contentListSerializationProxy: [] --- !u!114 &-4049380265876240392 MonoBehaviour: m_ObjectHideFlags: 1 @@ -553,7 +538,7 @@ MonoBehaviour: m_conditionCountMode: 1 m_minConditionCount: 0 m_numTrueConditions: 0 - m_childIndexList: 07000000 + m_childIndexList: 06000000 m_canvasRect: serializedVersion: 2 x: 220 @@ -602,57 +587,10 @@ MonoBehaviour: m_childIndexList: m_canvasRect: serializedVersion: 2 - x: 220 - y: 763 + x: 225 + y: 724 width: 120 height: 35 - - m_id: - m_text: - m_stringAsset: {fileID: 0} - m_textTable: {fileID: 0} - m_textTableFieldID: 0 - m_internalName: - m_text: - m_stringAsset: {fileID: 0} - m_textTable: {fileID: 0} - m_textTableFieldID: 0 - m_nodeType: 4 - m_isOptional: 0 - m_state: 0 - m_speaker: - m_text: - m_stringAsset: {fileID: 0} - m_textTable: {fileID: 0} - m_textTableFieldID: 0 - m_stateInfoList: - - m_actionList: [] - m_categorizedContentList: - - m_contentList: [] - - m_contentList: [] - - m_contentList: [] - - m_actionList: - - {fileID: -7499910049501382128} - m_categorizedContentList: - - m_contentList: [] - - m_contentList: [] - - m_contentList: [] - - m_actionList: [] - m_categorizedContentList: - - m_contentList: [] - - m_contentList: [] - - m_contentList: [] - m_conditionSet: - m_conditionList: [] - m_conditionCountMode: 1 - m_minConditionCount: 0 - m_numTrueConditions: 0 - m_childIndexList: 06000000 - m_canvasRect: - serializedVersion: 2 - x: 215 - y: 674 - width: 120 - height: 48 m_goalEntityTypeName: m_nextContentID: 0 --- !u!114 &176885676704061995 @@ -725,26 +663,6 @@ MonoBehaviour: m_contentList: - {fileID: 7369075533383603033} m_contentListSerializationProxy: [] ---- !u!114 &3763760843002708439 -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: Ruins Explored - m_stringAsset: {fileID: 0} - m_textTable: {fileID: 0} - m_textTableFieldID: 0 - m_headingLevel: 1 --- !u!114 &4478937982804482560 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 72df1a4b7..af82ec7ea 100644 --- a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity +++ b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity @@ -2005,6 +2005,8 @@ GameObject: - component: {fileID: 17702563} - component: {fileID: 17702565} - component: {fileID: 17702564} + - component: {fileID: 17702567} + - component: {fileID: 17702566} m_Layer: 11 m_Name: WitchHouseVisitTrigger m_TagString: Untagged @@ -2118,6 +2120,160 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &17702566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 17702562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} + m_Name: + m_EditorClassIdentifier: + trigger: 2 + fireOnce: 1 + condition: + luaConditions: [] + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + setQuestState: 1 + questName: + questState: 0 + setQuestEntryState: 0 + questEntryNumber: 1 + questEntryState: 0 + luaCode: + sequence: + sequenceSpeaker: {fileID: 0} + sequenceListener: {fileID: 0} + waitOneFrameOnStartOrEnable: 1 + alertMessage: + textTable: {fileID: 0} + alertDuration: 0 + sendMessages: [] + barkSource: 0 + barkConversation: + barkText: + barkTextSequence: + barker: {fileID: 0} + barkTarget: {fileID: 0} + barkOrder: 0 + allowBarksDuringConversations: 0 + skipBarkIfNoValidEntries: 0 + cacheBarkLines: 0 + conversation: + conversationConversant: {fileID: 0} + conversationActor: {fileID: 0} + startConversationEntryID: -1 + exclusive: 0 + skipIfNoValidEntries: 0 + stopConversationOnTriggerExit: 0 + stopConversationIfTooFar: 0 + maxConversationDistance: 5 + monitorConversationDistanceFrequency: 1 + showCursorDuringConversation: 0 + pauseGameDuringConversation: 0 + setActiveActions: [] + setEnabledActions: [] + setAnimatorStateActions: [] + onExecute: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 17702567} + m_TargetAssemblyTypeName: PixelCrushers.QuestMachine.Wrappers.QuestGiver, + Assembly-CSharp-firstpass + m_MethodName: GiveAllQuestsToQuester + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 1447701206} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + useConversationTitlePicker: 1 + useBarkTitlePicker: 1 + useQuestNamePicker: 1 + selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} +--- !u!114 &17702567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 17702562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2185d538298c73f418ba252c3e3e01ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + m_forwardEventsToListeners: 0 + m_includeInSavedGameData: 1 + m_addNewQuestsSinceSavedGame: 0 + m_questList: + - {fileID: 11400000, guid: b7097c4b7bc544de2b329f98e16c72e4, type: 2} + m_deletedStaticQuests: [] + m_id: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_displayName: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_image: {fileID: 0} + m_textTable: {fileID: 0} + m_noQuestsUIContents: + m_icon: {fileID: 0} + m_headingText: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_bodyText: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_offerableQuestsUIContents: + m_icon: {fileID: 0} + m_headingText: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_bodyText: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_activeQuestsUIContents: + m_icon: {fileID: 0} + m_headingText: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_bodyText: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_completedQuestDialogueMode: 0 + m_questDialogueUI: {fileID: 0} + m_cooldownCheckFrequency: 0 --- !u!1001 &17841907 PrefabInstance: m_ObjectHideFlags: 0 @@ -59464,6 +59620,39 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} +--- !u!21 &415579089 +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 &415954618 PrefabInstance: m_ObjectHideFlags: 0 @@ -77102,6 +77291,171 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!43 &539115731 +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 &539310164 PrefabInstance: m_ObjectHideFlags: 0 @@ -119052,39 +119406,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 730063325} m_PrefabAsset: {fileID: 0} ---- !u!21 &730140648 -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 &730246273 PrefabInstance: m_ObjectHideFlags: 0 @@ -138446,70 +138767,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} ---- !u!21 &875278987 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _DIRECTIONALL: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _DirectionalMode: 1 - - _FOGG: 1 - - _FogAxisMode: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 200 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: -200 - - _FogHeightEnd: 200 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _NOISEE: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMode: 2 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SKYBOXX: 1 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _TITLE: 1 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &875363292 GameObject: m_ObjectHideFlags: 0 @@ -156151,42 +156408,42 @@ PrefabInstance: - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -135 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210.00003 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 763034042805173548, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -156997,22 +157254,22 @@ PrefabInstance: - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -225 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4310148345887150382, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -157112,22 +157369,22 @@ PrefabInstance: - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -315 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4907318199456855652, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -158412,22 +158669,22 @@ PrefabInstance: - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7534046934194550914, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -160441,6 +160698,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1686797807} m_PrefabAsset: {fileID: 0} +--- !u!43 &1015708239 +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 &1016051062 PrefabInstance: m_ObjectHideFlags: 0 @@ -165509,6 +165931,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} +--- !u!21 &1063464610 +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 &1064151581 PrefabInstance: m_ObjectHideFlags: 0 @@ -440934,7 +441420,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 730140648} + - {fileID: 415579089} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -441027,7 +441513,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 875278987} + overrideMaterial: {fileID: 1063464610} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180