From 4d0231ed09f2639adbe3c22c8eba9322e8eefd44 Mon Sep 17 00:00:00 2001 From: marcin Date: Mon, 27 Oct 2025 16:04:33 +0100 Subject: [PATCH] fixed issues with triggers at witch house --- .../Grove/Roots/Spiked_roots_NOS.tga.meta | 37 +- .../DarkForest_Megascans/Cave_Nos.tga.meta | 37 +- .../Scenes/02_Ruined_Town/Ruined_Town.unity | 1767 +++++++++-------- .../InvectorDerivatives/ActionTriggerEvent.cs | 220 +- .../bTriggerGenericAction.cs | 10 +- .../bUnityUIQuestHUDToggleButtonController.cs | 101 +- 6 files changed, 1145 insertions(+), 1027 deletions(-) diff --git a/Assets/Meshes/Enviroment/Grove/Roots/Spiked_roots_NOS.tga.meta b/Assets/Meshes/Enviroment/Grove/Roots/Spiked_roots_NOS.tga.meta index c968cea3d..bf6d16b0d 100644 --- a/Assets/Meshes/Enviroment/Grove/Roots/Spiked_roots_NOS.tga.meta +++ b/Assets/Meshes/Enviroment/Grove/Roots/Spiked_roots_NOS.tga.meta @@ -3,7 +3,7 @@ guid: 13b0b2580c6a0ac409e4c872eb2276c2 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -53,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -63,8 +64,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 8192 resizeAlgorithm: 0 @@ -74,9 +77,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 8192 resizeAlgorithm: 0 @@ -86,10 +90,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone + - serializedVersion: 4 + buildTarget: iOS maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: 31 @@ -98,9 +103,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 8192 resizeAlgorithm: 0 @@ -110,10 +116,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps + - serializedVersion: 4 + buildTarget: WindowsStoreApps maxTextureSize: 8192 resizeAlgorithm: 0 textureFormat: -1 @@ -122,9 +129,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Server maxTextureSize: 8192 resizeAlgorithm: 0 @@ -134,12 +142,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: @@ -149,10 +159,11 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Prefabs/Environments/DarkForest_Megascans/Cave_Nos.tga.meta b/Assets/Prefabs/Environments/DarkForest_Megascans/Cave_Nos.tga.meta index 4a35c0d3f..e254aa0c0 100644 --- a/Assets/Prefabs/Environments/DarkForest_Megascans/Cave_Nos.tga.meta +++ b/Assets/Prefabs/Environments/DarkForest_Megascans/Cave_Nos.tga.meta @@ -3,7 +3,7 @@ guid: 9b2b239ac9a1c9a4e9dd08c571fb7a24 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -53,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -63,8 +64,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 8192 resizeAlgorithm: 0 @@ -74,9 +77,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 8192 resizeAlgorithm: 0 @@ -86,10 +90,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone + - serializedVersion: 4 + buildTarget: iOS maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: 30 @@ -98,9 +103,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 8192 resizeAlgorithm: 0 @@ -110,10 +116,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps + - serializedVersion: 4 + buildTarget: WindowsStoreApps maxTextureSize: 8192 resizeAlgorithm: 0 textureFormat: -1 @@ -122,9 +129,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Server maxTextureSize: 8192 resizeAlgorithm: 0 @@ -134,12 +142,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: @@ -149,10 +159,11 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity index b488caf9b..c526fe590 100644 --- a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity +++ b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity @@ -2007,6 +2007,7 @@ GameObject: - component: {fileID: 17702564} - component: {fileID: 17702567} - component: {fileID: 17702566} + - component: {fileID: 17702568} m_Layer: 11 m_Name: WitchHouseVisitTrigger m_TagString: Untagged @@ -2022,12 +2023,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 17702562} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -0.353883, z: 0, w: 0.93528974} + m_LocalRotation: {x: -0, y: -0.353883, z: -0, w: 0.93528974} m_LocalPosition: {x: -66.402, y: 42.383, z: 141.264} - m_LocalScale: {x: 1.34, y: 1, z: 1.84} + m_LocalScale: {x: 1.34, y: 1, z: 1.8400002} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 830642059} + m_Father: {fileID: 503929320} m_LocalEulerAnglesHint: {x: 0, y: -41.45, z: 0} --- !u!114 &17702564 MonoBehaviour: @@ -2274,6 +2275,35 @@ MonoBehaviour: m_completedQuestDialogueMode: 0 m_questDialogueUI: {fileID: 0} m_cooldownCheckFrequency: 0 +--- !u!114 &17702568 +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: 5f1c7f8f7ea5f24489652e06a3e710b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_conditionToEnable: + luaConditions: + - Variable["CH02KeyReceived"] == false + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + m_conditionToDisable: + luaConditions: [] + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + m_gameObjectsToEnable: [] + m_gameObjectsToDisable: [] --- !u!1001 &17841907 PrefabInstance: m_ObjectHideFlags: 0 @@ -6155,7 +6185,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 930486451} + objectReference: {fileID: 1979377141} - target: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Name @@ -17000,13 +17030,14 @@ GameObject: - component: {fileID: 110971712} - component: {fileID: 110971711} - component: {fileID: 110971710} + - component: {fileID: 110971714} m_Layer: 11 m_Name: 'WitchHouseCrystalTrigger(WithPoisonGland) ' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &110971709 Transform: m_ObjectHideFlags: 0 @@ -17015,12 +17046,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 110971708} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -0.353883, z: 0, w: 0.93528974} + m_LocalRotation: {x: -0, y: -0.353883, z: -0, w: 0.93528974} m_LocalPosition: {x: -60.497, y: 42.383, z: 143.985} - m_LocalScale: {x: 1.34, y: 1, z: 1.84} + m_LocalScale: {x: 1.34, y: 1, z: 1.8400002} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 830642059} + m_Father: {fileID: 503929320} m_LocalEulerAnglesHint: {x: 0, y: -41.45, z: 0} --- !u!114 &110971710 MonoBehaviour: @@ -17087,16 +17118,17 @@ MonoBehaviour: onExecute: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1367475707} - m_TargetAssemblyTypeName: QuestMachineAlertHelper, Assembly-CSharp - m_MethodName: ShowQuestMachineAlert + - m_Target: {fileID: 110971714} + m_TargetAssemblyTypeName: PixelCrushers.QuestMachine.Wrappers.QuestControl, + Assembly-CSharp-firstpass + m_MethodName: SendToMessageSystem m_Mode: 5 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: crystal collected + m_StringArgument: crystal:collected m_BoolArgument: 0 m_CallState: 2 useConversationTitlePicker: 1 @@ -17435,6 +17467,49 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &110971714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 110971708} + 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!1001 &111099359 PrefabInstance: m_ObjectHideFlags: 0 @@ -37880,39 +37955,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 239959893} m_PrefabAsset: {fileID: 0} ---- !u!21 &240630923 -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 &240795514 GameObject: m_ObjectHideFlags: 0 @@ -45521,6 +45563,171 @@ 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 @@ -74453,6 +74660,144 @@ MonoBehaviour: _disableOnStart: 0 _useDistanceFade: 0 _fadeRange: 5 +--- !u!1 &503929319 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 503929320} + - component: {fileID: 503929322} + - component: {fileID: 503929321} + m_Layer: 0 + m_Name: WitchHouseTriggers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &503929320 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503929319} + 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: 17702563} + - {fileID: 1820636052} + - {fileID: 110971709} + m_Father: {fileID: 830642059} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &503929321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503929319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6709a146e599d4c46882e1173a52b192, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: RUINEDTOWN_WITCH_2 + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + condition: + luaConditions: + - Variable["CH02KeyReceived"] == false + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + fireOnce: 0 + onConditionTrue: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1820636051} + 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: 1820636051} + 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!114 &503929322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503929319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6709a146e599d4c46882e1173a52b192, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: RUINEDTOWN_WITCH_1 + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + condition: + luaConditions: + - Variable["CH02PosionGlandCollected"] == true + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + fireOnce: 0 + onConditionTrue: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 110971708} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + onConditionFalse: + m_PersistentCalls: + m_Calls: [] + selectedDatabase: {fileID: 0} + CheckInterval: 1 --- !u!1001 &503992368 PrefabInstance: m_ObjectHideFlags: 0 @@ -135859,9 +136204,7 @@ Transform: - {fileID: 1723767138} - {fileID: 1223287650} - {fileID: 657758459} - - {fileID: 17702563} - - {fileID: 1820636052} - - {fileID: 110971709} + - {fileID: 503929320} - {fileID: 1603726903} - {fileID: 1905145261} m_Father: {fileID: 0} @@ -143820,171 +144163,6 @@ Transform: m_Children: [] m_Father: {fileID: 1099537664} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &893779731 -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 &894091025 PrefabInstance: m_ObjectHideFlags: 0 @@ -145435,6 +145613,171 @@ 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 @@ -150240,171 +150583,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 929937335} m_PrefabAsset: {fileID: 0} ---- !u!43 &930486451 -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 &930717971 PrefabInstance: m_ObjectHideFlags: 0 @@ -162508,6 +162686,70 @@ 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, @@ -227282,171 +227524,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 909840033} m_PrefabAsset: {fileID: 0} ---- !u!43 &1508624101 -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!4 &1508704859 stripped Transform: m_CorrespondingSourceObject: {fileID: 4562641216802707665, guid: d97c9abcb1d6bed4fb19e538b4ecf510, @@ -228357,6 +228434,39 @@ 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 @@ -251149,171 +251259,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1669618547} m_PrefabAsset: {fileID: 0} ---- !u!43 &1670049271 -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 &1670630718 stripped Transform: m_CorrespondingSourceObject: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, @@ -323222,7 +323167,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 893779731} + objectReference: {fileID: 1921550275} - target: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Name @@ -326736,12 +326681,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1820636051} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -0.353883, z: 0, w: 0.93528974} + m_LocalRotation: {x: -0, y: -0.353883, z: -0, w: 0.93528974} m_LocalPosition: {x: -60.497, y: 42.383, z: 143.985} - m_LocalScale: {x: 1.34, y: 1, z: 1.84} + m_LocalScale: {x: 1.34, y: 1, z: 1.8400002} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 830642059} + m_Father: {fileID: 503929320} m_LocalEulerAnglesHint: {x: 0, y: -41.45, z: 0} --- !u!114 &1820636053 MonoBehaviour: @@ -330084,70 +330029,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1436666181} m_PrefabAsset: {fileID: 0} ---- !u!21 &1841275334 -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 &1841724017 stripped Transform: m_CorrespondingSourceObject: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, @@ -342364,6 +342245,171 @@ 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, @@ -350863,6 +350909,171 @@ 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 @@ -448155,7 +448366,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 240630923} + - {fileID: 1519070957} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -448248,7 +448459,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 1841275334} + overrideMaterial: {fileID: 1004889254} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 diff --git a/Assets/Scripts/InvectorDerivatives/ActionTriggerEvent.cs b/Assets/Scripts/InvectorDerivatives/ActionTriggerEvent.cs index 4c8947ea9..a74854a45 100644 --- a/Assets/Scripts/InvectorDerivatives/ActionTriggerEvent.cs +++ b/Assets/Scripts/InvectorDerivatives/ActionTriggerEvent.cs @@ -29,88 +29,16 @@ namespace Beyond public static Action ActionTriggerEnter; public static Action ActionTriggerExit; - /* - public static Action LadderTriggerEnter; - public static Action LadderTriggerExit; - - public static Action FootbridgeTriggerEnter; - public static Action FootbridgeTriggerExit; - - public static Action EnterFootbridge; - public static Action ExitFootbridge; - public UnityEvent OnHideOnTriggerEnter; - public UnityEvent OnHideOnTriggerExit; - - public UnityEvent OnActionTriggerEnter; - public UnityEvent OnActionTriggerExit; - - public UnityEvent OnLadderTriggerEnter; - public UnityEvent OnLadderTriggerExit; - - public UnityEvent OnFootbridgeTriggerEnter; - public UnityEvent OnFootbridgeTriggerExit; - - public UnityEvent OnEnterFootbridge; - public UnityEvent OnExitFootbridge; - */ private bool usingFootbridge; - private TriggerDescriptor m_currentDesc; - private List m_Triggers = new List(); + + // NEW: Dictionary for reference counting to handle multiple colliders + private Dictionary m_TriggerCounts = new Dictionary(); private GameStateManager.State m_prevGameState = GameStateManager.State.NORMAL; - /* -private List m_triggers = new List(); -public enum TriggerType -{ -Dialogue, -Ladder, -Generic, -Collectable, -COUNT -}; - -public struct TriggerObject : IComparable, IComparable -{ -public GameObject obj; -public TriggerType type; - -public int CompareTo(TriggerObject other) -{ -return type.CompareTo(other.type); -} - -public int CompareTo(object obj) -{ -if (ReferenceEquals(null, obj)) return 1; -return obj is TriggerObject other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(TriggerObject)}"); -} - -public static bool operator <(TriggerObject left, TriggerObject right) -{ -return left.CompareTo(right) < 0; -} - -public static bool operator >(TriggerObject left, TriggerObject right) -{ -return left.CompareTo(right) > 0; -} - -public static bool operator <=(TriggerObject left, TriggerObject right) -{ -return left.CompareTo(right) <= 0; -} - -public static bool operator >=(TriggerObject left, TriggerObject right) -{ -return left.CompareTo(right) >= 0; -} -} -*/ - private void Initialize() { if (LadderButton) @@ -133,11 +61,6 @@ return left.CompareTo(right) >= 0; } if (RunButton) RunButton.gameObject.SetActive(!disableRun); - - //if (TargetButton) - // TargetButton.gameObject.SetActive(true); - //if (JumpButton) - // JumpButton.gameObject.SetActive(true); } private void OnActionTrigger(bool activate, TriggerDescriptor.TriggerType type) @@ -162,37 +85,21 @@ return left.CompareTo(right) >= 0; AttackButton.gameObject.SetActive(!activate); if (SpellButton) SpellButton.gameObject.SetActive(!activate); - //if (ComsumableButton) - // ComsumableButton.gameObject.SetActive(!activate); - //if (ComsumableFaithButton) - // ComsumableFaithButton.gameObject.SetActive(!activate); if (powerButtonsParent) { powerButtonsParent.SetActive(!activate); } if (RunButton && !disableRun) RunButton.interactable = !activate; - //if (TargetButton) - // TargetButton.interactable = !activate; - //if (JumpButton) - // JumpButton.interactable = !activate; } private void Start() { ActionTriggerEnter += OnInvokeActionTriggerEnter; ActionTriggerExit += OnInvokeActionTriggerExit; - GameStateManager.Instance.m_OnStateChanged.AddListener(OnGameStateChanged); + if (GameStateManager.Instance) + GameStateManager.Instance.m_OnStateChanged.AddListener(OnGameStateChanged); - /* - LadderTriggerEnter += OnInvokeLadderTriggerEnter; - LadderTriggerExit += OnInvokeLadderTriggerExit; - FootbridgeTriggerEnter += OnInvokeFootbridgeTriggerEnter; - FootbridgeTriggerExit += OnInvokeFootbridgeTriggerExit; - EnterFootbridge += OnInvokeEnterFootbridge; - ExitFootbridge += OnInvokeExitFootbridge; - */ - //OnInvokeActionTriggerExit(gameObject); Initialize(); } @@ -202,14 +109,6 @@ return left.CompareTo(right) >= 0; ActionTriggerExit -= OnInvokeActionTriggerExit; if (GameStateManager.Instance) GameStateManager.Instance.m_OnStateChanged.RemoveListener(OnGameStateChanged); - /* - LadderTriggerEnter -= OnInvokeLadderTriggerEnter; - LadderTriggerExit -= OnInvokeLadderTriggerExit; - FootbridgeTriggerEnter -= OnInvokeFootbridgeTriggerEnter; - FootbridgeTriggerExit -= OnInvokeFootbridgeTriggerExit; - EnterFootbridge -= OnInvokeEnterFootbridge; - ExitFootbridge -= OnInvokeExitFootbridge; - */ } void OnGameStateChanged(GameStateManager.State state) @@ -234,99 +133,48 @@ return left.CompareTo(right) >= 0; } } - /* - private void OnInvokeHideOnTriggerEnter() - { - DebugLog("OnInvokeHideOnTriggerEnter"); - OnHideOnTriggerEnter?.Invoke(); - } - - private void OnInvokeHideOnTriggerExit() - { - DebugLog("OnInvokeHideOnTriggerExit"); - OnHideOnTriggerExit?.Invoke(); - } - - private void OnInvokeEnterFootbridge(GameObject gameObject) - { - DebugLog("OnInvokeEnterFootbridge"); - usingFootbridge = true; - OnInvokeHideOnTriggerEnter(); - OnEnterFootbridge?.Invoke(); - } - - private void OnInvokeExitFootbridge(GameObject gameObject) - { - DebugLog("OnInvokeExitFootbridge"); - usingFootbridge = false; - OnInvokeHideOnTriggerExit(); - OnExitFootbridge?.Invoke(); - } - - private void OnInvokeFootbridgeTriggerEnter(GameObject gameObject) - { - if (usingFootbridge) return; - DebugLog("OnInvokeFootbridgeTriggerEnter"); - OnFootbridgeTriggerEnter?.Invoke(); - OnInvokeHideOnTriggerEnter(); - } - - private void OnInvokeFootbridgeTriggerExit(GameObject gameObject) - { - if (usingFootbridge) return; - DebugLog("OnInvokeFootbridgeTriggerExit"); - OnFootbridgeTriggerExit?.Invoke(); - OnInvokeHideOnTriggerExit(); - } - */ - + // CORRECTED: Handles multiple colliders entering the same trigger. private void OnInvokeActionTriggerEnter(TriggerDescriptor to) { - DebugLog("OnInvokeActionTriggerEnter"); - //OnActionTrigger(true, to.type); - //OnActionTriggerEnter?.Invoke(); - //OnInvokeHideOnTriggerEnter(); - if (!m_Triggers.Contains(to)) + DebugLog("OnInvokeActionTriggerEnter for: " + to.obj.name); + if (!m_TriggerCounts.ContainsKey(to)) + { m_Triggers.Add(to); + m_TriggerCounts.Add(to, 1); // Add to dictionary with a count of 1. + } + else + { + m_TriggerCounts[to]++; // If already present, just increment the count. + } } - + + // CORRECTED: Handles multiple colliders exiting the same trigger. private void OnInvokeActionTriggerExit(TriggerDescriptor to) { - //OnActionTrigger(false, to.type); - DebugLog("OnInvokeActionTriggerExit"); - //OnActionTriggerExit?.Invoke(); - //OnInvokeHideOnTriggerExit(); - if (m_Triggers.Contains(to)) + DebugLog("OnInvokeActionTriggerExit for: " + to.obj.name); + if (m_TriggerCounts.ContainsKey(to)) { - m_Triggers.Remove(to); - if (to == m_currentDesc) + m_TriggerCounts[to]--; // Decrement the reference count. + + // Only remove the trigger completely if this was the last collider to exit. + if (m_TriggerCounts[to] <= 0) { - OnActionTrigger(false, to.type); - m_currentDesc = null; + m_TriggerCounts.Remove(to); // Clean up the dictionary. + m_Triggers.Remove(to); + if (to == m_currentDesc) + { + OnActionTrigger(false, to.type); + m_currentDesc = null; + } } } else { + // This error should no longer occur with the new logic. Debug.LogError("Exitting trigger that is not on the list! " + to.obj.name, this); } } - /* - private void OnInvokeLadderTriggerEnter(GameObject gameObject) - { - DebugLog("OnInvokeLadderTriggerEnter"); - OnLadderTriggerEnter?.Invoke(); - OnInvokeHideOnTriggerEnter(); - } - - private void OnInvokeLadderTriggerExit(GameObject gameObject) - { - DebugLog("OnInvokeLadderTriggerExit"); - OnLadderTriggerExit?.Invoke(); - OnInvokeHideOnTriggerExit(); - } - */ - private void Update() { var gameState = GameStateManager.Instance.CurrentState; @@ -371,6 +219,12 @@ return left.CompareTo(right) >= 0; } } } + // This handles the case where the last trigger was removed from the list + else if (m_currentDesc != null) + { + OnActionTrigger(false, m_currentDesc.type); + m_currentDesc = null; + } } } } \ No newline at end of file diff --git a/Assets/Scripts/InvectorDerivatives/bTriggerGenericAction.cs b/Assets/Scripts/InvectorDerivatives/bTriggerGenericAction.cs index 5c465ee9e..40327f82d 100644 --- a/Assets/Scripts/InvectorDerivatives/bTriggerGenericAction.cs +++ b/Assets/Scripts/InvectorDerivatives/bTriggerGenericAction.cs @@ -25,8 +25,6 @@ namespace Beyond public bool disableHUD = true; [vHelpBox("Changes interaction image")] - //public bool isDialogueTrigger = false; - public TriggerDescriptor.TriggerType triggerType = TriggerDescriptor.TriggerType.Generic; public UnityEvent OnPlayerMatchTargetPosition; @@ -130,6 +128,11 @@ namespace Beyond 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); @@ -139,6 +142,7 @@ namespace Beyond { Player.Instance.ResetIntaractableButtonImage(); } + */ if (!m_enableInteractionLegality) { @@ -165,12 +169,10 @@ namespace Beyond { 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() diff --git a/Assets/Scripts/QuestMachineDerivatives/bUnityUIQuestHUDToggleButtonController.cs b/Assets/Scripts/QuestMachineDerivatives/bUnityUIQuestHUDToggleButtonController.cs index cb844f5b7..ee78bd9ea 100644 --- a/Assets/Scripts/QuestMachineDerivatives/bUnityUIQuestHUDToggleButtonController.cs +++ b/Assets/Scripts/QuestMachineDerivatives/bUnityUIQuestHUDToggleButtonController.cs @@ -37,27 +37,35 @@ namespace Beyond { MessageSystem.AddListener(this, QuestMachineMessages.QuestStateChangedMessage, string.Empty); m_menuScroll = FindObjectOfType(); - m_menuScroll.OnOpened += DisableButtonImage; - m_menuScroll.OnClosed += EnableButtonImage; + if (m_menuScroll != null) + { + m_menuScroll.OnOpened += DisableButtonImage; + m_menuScroll.OnClosed += EnableButtonImage; + } - m_UIPanel.onOpen.AddListener(OnOpen); - m_UIPanel.onClose.AddListener(OnClose); + if (m_UIPanel != null) + { + m_UIPanel.onOpen.AddListener(OnOpen); + m_UIPanel.onClose.AddListener(OnClose); + } } private void OnEnable() { TryToStartAutohideCoroutine(); } - - private void OnDisable() - { - // Clean up listeners if needed - } - + private void OnDestroy() { MessageSystem.RemoveListener(this, QuestMachineMessages.QuestStateChangedMessage, string.Empty); - if (m_UIPanel.gameObject != null) + + if (m_menuScroll != null) + { + m_menuScroll.OnOpened -= DisableButtonImage; + m_menuScroll.OnClosed -= EnableButtonImage; + } + + if (m_UIPanel != null && m_UIPanel.gameObject != null) { m_UIPanel.onOpen.RemoveListener(OnOpen); m_UIPanel.onClose.RemoveListener(OnClose); @@ -66,14 +74,20 @@ namespace Beyond public void OnMessage(MessageArgs messageArgs) { + // Optional but recommended: check if active before processing message + if (!gameObject.activeInHierarchy) return; + switch (messageArgs.message) { case QuestMachineMessages.QuestStateChangedMessage: if ((QuestState)messageArgs.values[1] == QuestState.Active) { - m_UIPanel.Close(); - m_UIPanel.Open(); - TryToStartAutohideCoroutine(); + if (m_UIPanel != null) + { + m_UIPanel.Close(); + m_UIPanel.Open(); + } + // The OnOpen listener will call TryToStartAutohideCoroutine } break; } @@ -99,50 +113,65 @@ namespace Beyond private void DisableButtonImage() { - if (m_buttonImage == null) - { - return; - } + if (m_buttonImage == null) return; m_buttonImage.enabled = false; } private void EnableButtonImage() { - if (m_buttonImage == null) - { - return; - } + if (m_buttonImage == null) return; m_buttonImage.enabled = true; } private IEnumerator COR_AutoHide() { yield return new WaitForSeconds(m_autoHideTime); - m_UIPanel.Close(); + if (m_UIPanel != null) + { + m_UIPanel.Close(); + } m_hiddingCoroutine = null; } - + private void OnClose() { - m_hiddingCoroutine = null; - SetImageToClosed(); - } - - private void TryToStartAutohideCoroutine() - { - if (!m_autoHide) - return; - if (m_hiddingCoroutine != null ) + // Stop the coroutine if the panel is closed manually + if (m_hiddingCoroutine != null) { StopCoroutine(m_hiddingCoroutine); + m_hiddingCoroutine = null; } - m_hiddingCoroutine = StartCoroutine(COR_AutoHide()); + SetImageToClosed(); } - + private void OnOpen() { SetImageToOpen(); TryToStartAutohideCoroutine(); } + + private void TryToStartAutohideCoroutine() + { + // FIX: Check if the GameObject is active before starting a coroutine. + // This prevents the "Coroutine couldn't be started" error. + if (!gameObject.activeInHierarchy) + { + return; + } + + if (!m_autoHide) + { + return; + } + + // Stop any previously running hide coroutine to reset the timer + if (m_hiddingCoroutine != null) + { + StopCoroutine(m_hiddingCoroutine); + } + + // This is line 139 from your original script + m_hiddingCoroutine = StartCoroutine(COR_AutoHide()); + } } -} +} \ No newline at end of file