From c66f9d0e768f48f77c65cd87831aac2ef679bc55 Mon Sep 17 00:00:00 2001 From: rezazfn Date: Thu, 13 Feb 2025 19:49:34 +0800 Subject: [PATCH] game: day 3 done (should be working) --- ...lling Choice.unity => CallingChoice.unity} | 1060 +++++++++-------- ...ce.unity.meta => CallingChoice.unity.meta} | 2 +- Game/Assets/Scenes/Day3.unity | 554 ++++----- Game/Assets/Scripts/BedroomTask.cs | 2 +- Game/Assets/Scripts/Day3.cs | 37 + Game/Assets/Scripts/Day3.cs.meta | 11 + Game/Assets/Scripts/EffectTrigger.cs | 32 + Game/Assets/Scripts/EffectTrigger.cs.meta | 11 + Game/Assets/Scripts/GameManager.cs | 2 +- Game/Assets/Scripts/PostProcessingManager.cs | 55 +- 10 files changed, 906 insertions(+), 860 deletions(-) rename Game/Assets/Scenes/{Calling Choice.unity => CallingChoice.unity} (99%) rename Game/Assets/Scenes/{Calling Choice.unity.meta => CallingChoice.unity.meta} (74%) create mode 100644 Game/Assets/Scripts/Day3.cs create mode 100644 Game/Assets/Scripts/Day3.cs.meta create mode 100644 Game/Assets/Scripts/EffectTrigger.cs create mode 100644 Game/Assets/Scripts/EffectTrigger.cs.meta diff --git a/Game/Assets/Scenes/Calling Choice.unity b/Game/Assets/Scenes/CallingChoice.unity similarity index 99% rename from Game/Assets/Scenes/Calling Choice.unity rename to Game/Assets/Scenes/CallingChoice.unity index 29cb4f8..77ec644 100644 --- a/Game/Assets/Scenes/Calling Choice.unity +++ b/Game/Assets/Scenes/CallingChoice.unity @@ -2177,6 +2177,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 1160350011} + - target: {fileID: 1664691393556969827, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 2323916903307634800, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_LocalScale.y value: 0.96353 @@ -2253,10 +2257,18 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 224055497} + - target: {fileID: 8289180138563017339, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 70224491} + - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8655799077491988823, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: @@ -4293,6 +4305,76 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &29017748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 29017750} + - component: {fileID: 29017749} + - component: {fileID: 29017751} + m_Layer: 0 + m_Name: MessageTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &29017749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 29017748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dd9f95621cce5d4389410717683d6be, type: 3} + m_Name: + m_EditorClassIdentifier: + storyPanelUI: {fileID: 620624014} + storyText: {fileID: 1214791149} + message: I woke up late again... I don't feel like going to school today + displayDuration: 7 +--- !u!4 &29017750 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 29017748} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 72.443, y: 20.527, z: 1068.328} + m_LocalScale: {x: 1.1233, y: 1, z: 1.0776252} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &29017751 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 29017748} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!43 &31295543 Mesh: m_ObjectHideFlags: 0 @@ -22119,14 +22201,14 @@ Transform: m_GameObject: {fileID: 123591707} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.8701624, z: -0, w: 0.4927651} - m_LocalPosition: {x: -6.300995, y: 2.8075523, z: 1.0880127} - m_LocalScale: {x: 0.3226463, y: 0.3226463, z: 0.3226463} + m_LocalPosition: {x: -249.57883, y: -19.167133, z: 13747.258} + m_LocalScale: {x: 5.4582605, y: 5.458259, z: 5.4582605} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1767780004} - {fileID: 1179906217} - {fileID: 1332821468} - m_Father: {fileID: 2057524443} + m_Father: {fileID: 1688857688} m_LocalEulerAnglesHint: {x: 0, y: 120.955, z: 0} --- !u!43 &124144733 Mesh: @@ -26787,140 +26869,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &140875954 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 140875955} - - component: {fileID: 140875957} - - component: {fileID: 140875956} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &140875955 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 140875954} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1708351088} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &140875956 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 140875954} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Yes, leave house. - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &140875957 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 140875954} - m_CullTransparentMesh: 1 --- !u!43 &141008991 Mesh: m_ObjectHideFlags: 0 @@ -29756,6 +29704,10 @@ PrefabInstance: propertyPath: m_Name value: Bottles objectReference: {fileID: 0} + - target: {fileID: 5630556597635509139, guid: e9780caa44a72904897def65e3f50790, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6461864394007631706, guid: e9780caa44a72904897def65e3f50790, type: 3} propertyPath: m_Mesh value: @@ -33555,6 +33507,171 @@ Mesh: offset: 0 size: 0 path: +--- !u!43 &170666634 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh-153610 + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0.69231033, y: 0.014350973, z: 0.18444824} + m_Extent: {x: 0.6923094, y: 0.014347076, z: 0.18450928} + 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: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + 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: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + 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: 1152 + _typelessdata: 0000703500c8823600e8bc3e00000000000000000000803f000080bf0000000000000000000080bf000070b500c88236383bb13f00c8823600e8bc3e00000000000000000000803f000080bf0000000000000000000080bf383bb1bf00c88236000070352c18eb3c00e8bc3e00000000000000000000803f000080bf0000000000000000000080bf000070b52c18eb3c383bb13f2c18eb3c00e8bc3e00000000000000000000803f000080bf0000000000000000000080bf383bb1bf2c18eb3c383bb13f00c8823600e8bc3e0000803f000000000000000000000000000000000000803f000080bf00e8bc3e00c88236383bb13f00c88236000080b80000803f000000000000000000000000000000000000803f000080bf000080b800c88236383bb13f2c18eb3c00e8bc3e0000803f000000000000000000000000000000000000803f000080bf00e8bc3e2c18eb3c383bb13f2c18eb3c000080b80000803f000000000000000000000000000000000000803f000080bf000080b82c18eb3c383bb13f00c88236000080b80000000000000000000080bf0000803f0000000000000000000080bf383bb13f00c882360000703500c88236000080b80000000000000000000080bf0000803f0000000000000000000080bf0000703500c88236383bb13f2c18eb3c000080b80000000000000000000080bf0000803f0000000000000000000080bf383bb13f2c18eb3c000070352c18eb3c000080b80000000000000000000080bf0000803f0000000000000000000080bf000070352c18eb3c0000703500c88236000080b8000080bf00000000000000000000000000000000000080bf000080bf0000803800c882360000703500c8823600e8bc3e000080bf00000000000000000000000000000000000080bf000080bf00e8bcbe00c88236000070352c18eb3c000080b8000080bf00000000000000000000000000000000000080bf000080bf000080382c18eb3c000070352c18eb3c00e8bc3e000080bf00000000000000000000000000000000000080bf000080bf00e8bcbe2c18eb3c000070352c18eb3c00e8bc3e000000000000803f000000000000803f0000000000000000000080bf0000703500e8bc3e383bb13f2c18eb3c00e8bc3e000000000000803f000000000000803f0000000000000000000080bf383bb13f00e8bc3e000070352c18eb3c000080b8000000000000803f000000000000803f0000000000000000000080bf00007035000080b8383bb13f2c18eb3c000080b8000000000000803f000000000000803f0000000000000000000080bf383bb13f000080b80000703500c88236000080b800000000000080bf00000000000080bf0000000000000000000080bf000070b5000080b8383bb13f00c88236000080b800000000000080bf00000000000080bf0000000000000000000080bf383bb1bf000080b80000703500c8823600e8bc3e00000000000080bf00000000000080bf0000000000000000000080bf000070b500e8bc3e383bb13f00c8823600e8bc3e00000000000080bf00000000000080bf0000000000000000000080bf383bb1bf00e8bc3e + 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.69231033, y: 0.014350973, z: 0.18444824} + m_Extent: {x: 0.6923094, y: 0.014347076, z: 0.18450928} + 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!43 &171560133 Mesh: m_ObjectHideFlags: 0 @@ -38310,22 +38427,22 @@ MonoBehaviour: - serializedVersion: 3 time: 0 value: 0 - inSlope: 2 - outSlope: 2 + inSlope: 1.8466054 + outSlope: 1.8466054 tangentMode: 0 weightedMode: 0 inWeight: 0 - outWeight: 0 + outWeight: 0.024915176 - serializedVersion: 3 - time: 0.5839262 - value: 0.006742792 - inSlope: -3.9736369 - outSlope: -3.9736369 + time: 1.0952759 + value: -0.0050354004 + inSlope: -1.4948272 + outSlope: -1.4948272 tangentMode: 0 weightedMode: 0 - inWeight: 0.015775587 + inWeight: 0.027786292 outWeight: 0 - m_PreInfinity: 2 + m_PreInfinity: 1 m_PostInfinity: 1 m_RotationOrder: 4 chromaticAberrationIntensity: @@ -39411,14 +39528,14 @@ Transform: m_GameObject: {fileID: 210049006} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.3924713, y: 2.4364738, z: 0.70080566} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -251.12636, y: -25.444727, z: 13740.707} + m_LocalScale: {x: 16.91716, y: 16.91716, z: 16.91716} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 279787523} - {fileID: 412343589} - {fileID: 1710019} - m_Father: {fileID: 2057524443} + m_Father: {fileID: 1688857688} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &210444537 Mesh: @@ -42246,6 +42363,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 171560133} + - target: {fileID: 1664691393556969827, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 2323916903307634800, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_LocalScale.y value: 0.96353 @@ -42322,10 +42443,18 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 1691370183} + - target: {fileID: 8289180138563017339, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 677550624} + - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8655799077491988823, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: @@ -65848,7 +65977,6 @@ RectTransform: m_LocalScale: {x: 0.0019388271, y: 0.0019388271, z: 0.0019388271} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1708351088} - {fileID: 2075370362} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -72686,6 +72814,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 153789116} + - target: {fileID: 1664691393556969827, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 2323916903307634800, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_LocalScale.y value: 0.96353 @@ -72762,10 +72894,18 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 710826959} + - target: {fileID: 8289180138563017339, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 1546062198} + - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8655799077491988823, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: @@ -83886,7 +84026,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6569076738997671329, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} + - {fileID: 1861023319400424536, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -84413,7 +84555,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!65 &442074721 BoxCollider: m_ObjectHideFlags: 0 @@ -90694,6 +90836,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 1702981853} + - target: {fileID: 1664691393556969827, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 2323916903307634800, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_LocalScale.y value: 0.96353 @@ -90761,19 +90907,27 @@ PrefabInstance: - target: {fileID: 6966121448231230207, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1588331812} + objectReference: {fileID: 170666634} - target: {fileID: 8209116549499813696, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1588331812} + objectReference: {fileID: 170666634} - target: {fileID: 8289180138563017339, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 678203991} + - target: {fileID: 8289180138563017339, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1588331812} + objectReference: {fileID: 170666634} + - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8655799077491988823, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: @@ -92465,6 +92619,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 1740387945} + - target: {fileID: 1664691393556969827, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 2323916903307634800, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_LocalScale.y value: 0.96353 @@ -92541,10 +92699,18 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 222739113} + - target: {fileID: 8289180138563017339, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 44497913} + - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8655799077491988823, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: @@ -126152,6 +126318,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 1503768572} + - target: {fileID: 1664691393556969827, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 2323916903307634800, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_LocalScale.y value: 0.96353 @@ -126228,10 +126398,18 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 1628095891} + - target: {fileID: 8289180138563017339, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 420374283} + - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8655799077491988823, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: @@ -130533,7 +130711,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &707184550 RectTransform: m_ObjectHideFlags: 0 @@ -135538,7 +135716,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: No, not yet. + m_text: No, not today. m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -138773,7 +138951,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &745726886 Transform: m_ObjectHideFlags: 0 @@ -143657,6 +143835,10 @@ PrefabInstance: propertyPath: m_Name value: Bottles objectReference: {fileID: 0} + - target: {fileID: 5630556597635509139, guid: e9780caa44a72904897def65e3f50790, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6461864394007631706, guid: e9780caa44a72904897def65e3f50790, type: 3} propertyPath: m_Mesh value: @@ -154325,6 +154507,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 1926758116} + - target: {fileID: 1664691393556969827, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 2323916903307634800, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_LocalScale.y value: 0.96353 @@ -154401,10 +154587,18 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 1360327770} + - target: {fileID: 8289180138563017339, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 899431351} + - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8655799077491988823, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: @@ -164209,6 +164403,10 @@ PrefabInstance: propertyPath: m_Name value: Broom_Reza objectReference: {fileID: 0} + - target: {fileID: 7419541130731033687, guid: 2232353fd6a781a43a80ffae781ba792, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7907285160866860781, guid: 2232353fd6a781a43a80ffae781ba792, type: 3} propertyPath: m_LocalPosition.x value: 4.4542084 @@ -177166,7 +177364,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6045648537344725186, guid: a4a4b6738cb4ba34bb94baa14bd938f0, type: 3} propertyPath: m_LocalPosition.z - value: 1068.746 + value: 1069.151 objectReference: {fileID: 0} - target: {fileID: 6045648537344725186, guid: a4a4b6738cb4ba34bb94baa14bd938f0, type: 3} propertyPath: m_LocalRotation.w @@ -185075,11 +185273,11 @@ Transform: m_GameObject: {fileID: 1009031622} serializedVersion: 2 m_LocalRotation: {x: 0.40629068, y: -0, z: 0.9137439, w: 0} - m_LocalPosition: {x: -6.4839935, y: 2.822651, z: 1.2735596} - m_LocalScale: {x: 0.55451995, y: 0.55451995, z: 0.55452} + m_LocalPosition: {x: -252.67465, y: -18.911707, z: 13750.396} + m_LocalScale: {x: 9.380905, y: 9.380902, z: 9.380905} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2057524443} + m_Father: {fileID: 1688857688} m_LocalEulerAnglesHint: {x: 0, y: 47.944, z: 180} --- !u!43 &1010521090 Mesh: @@ -191084,6 +191282,10 @@ PrefabInstance: propertyPath: m_Name value: Needles objectReference: {fileID: 0} + - target: {fileID: 3510408986590439666, guid: 115e0f30c5ec185489b02437aec67077, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4226959381646210589, guid: 115e0f30c5ec185489b02437aec67077, type: 3} propertyPath: m_Mesh value: @@ -237912,7 +238114,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: New Text + m_text: ' ' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -246132,6 +246334,73 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &1254651706 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1254651709} + - component: {fileID: 1254651708} + - component: {fileID: 1254651707} + m_Layer: 0 + m_Name: EffectTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1254651707 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254651706} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1254651708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254651706} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b37f04853730f540abd4bedc166c049, type: 3} + m_Name: + m_EditorClassIdentifier: + effectName: Headache +--- !u!4 &1254651709 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254651706} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 76.33916, y: 21.45, z: 1065.1228} + m_LocalScale: {x: 17.59641, y: 4.4528017, z: 12.768409} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1254955191 Mesh: m_ObjectHideFlags: 0 @@ -253192,6 +253461,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 746702277} + - target: {fileID: 1664691393556969827, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 2323916903307634800, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_LocalScale.y value: 0.96353 @@ -253268,10 +253541,18 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 1954002637} + - target: {fileID: 8289180138563017339, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 100527665} + - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8655799077491988823, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: @@ -292411,6 +292692,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 155188271} + - target: {fileID: 1664691393556969827, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 2323916903307634800, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_LocalScale.y value: 0.96353 @@ -292487,10 +292772,18 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 4482176} + - target: {fileID: 8289180138563017339, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 714033241} + - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8655799077491988823, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: @@ -292733,7 +293026,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6569076738997671329, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} + - {fileID: 1861023319400424536, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -295332,14 +295627,14 @@ Transform: m_GameObject: {fileID: 1518388178} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.6124573, y: 2.0715733, z: 0.7832031} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -221.01358, y: -31.61781, z: 13742.102} + m_LocalScale: {x: 16.91716, y: 16.91716, z: 16.91716} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 743219830} - {fileID: 560595111} - {fileID: 277057902} - m_Father: {fileID: 2057524443} + m_Father: {fileID: 1688857688} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1518673557 Mesh: @@ -307773,171 +308068,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!43 &1588331812 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-183078(Clone)(Clone)(Clone) - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0.69231033, y: 0.014350973, z: 0.18444824} - m_Extent: {x: 0.6923094, y: 0.014347076, z: 0.18450928} - 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: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - 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: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - 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: 1152 - _typelessdata: 0000703500c8823600e8bc3e00000000000000000000803f000080bf0000000000000000000080bf000070b500c88236383bb13f00c8823600e8bc3e00000000000000000000803f000080bf0000000000000000000080bf383bb1bf00c88236000070352c18eb3c00e8bc3e00000000000000000000803f000080bf0000000000000000000080bf000070b52c18eb3c383bb13f2c18eb3c00e8bc3e00000000000000000000803f000080bf0000000000000000000080bf383bb1bf2c18eb3c383bb13f00c8823600e8bc3e0000803f000000000000000000000000000000000000803f000080bf00e8bc3e00c88236383bb13f00c88236000080b80000803f000000000000000000000000000000000000803f000080bf000080b800c88236383bb13f2c18eb3c00e8bc3e0000803f000000000000000000000000000000000000803f000080bf00e8bc3e2c18eb3c383bb13f2c18eb3c000080b80000803f000000000000000000000000000000000000803f000080bf000080b82c18eb3c383bb13f00c88236000080b80000000000000000000080bf0000803f0000000000000000000080bf383bb13f00c882360000703500c88236000080b80000000000000000000080bf0000803f0000000000000000000080bf0000703500c88236383bb13f2c18eb3c000080b80000000000000000000080bf0000803f0000000000000000000080bf383bb13f2c18eb3c000070352c18eb3c000080b80000000000000000000080bf0000803f0000000000000000000080bf000070352c18eb3c0000703500c88236000080b8000080bf00000000000000000000000000000000000080bf000080bf0000803800c882360000703500c8823600e8bc3e000080bf00000000000000000000000000000000000080bf000080bf00e8bcbe00c88236000070352c18eb3c000080b8000080bf00000000000000000000000000000000000080bf000080bf000080382c18eb3c000070352c18eb3c00e8bc3e000080bf00000000000000000000000000000000000080bf000080bf00e8bcbe2c18eb3c000070352c18eb3c00e8bc3e000000000000803f000000000000803f0000000000000000000080bf0000703500e8bc3e383bb13f2c18eb3c00e8bc3e000000000000803f000000000000803f0000000000000000000080bf383bb13f00e8bc3e000070352c18eb3c000080b8000000000000803f000000000000803f0000000000000000000080bf00007035000080b8383bb13f2c18eb3c000080b8000000000000803f000000000000803f0000000000000000000080bf383bb13f000080b80000703500c88236000080b800000000000080bf00000000000080bf0000000000000000000080bf000070b5000080b8383bb13f00c88236000080b800000000000080bf00000000000080bf0000000000000000000080bf383bb1bf000080b80000703500c8823600e8bc3e00000000000080bf00000000000080bf0000000000000000000080bf000070b500e8bc3e383bb13f00c8823600e8bc3e00000000000080bf00000000000080bf0000000000000000000080bf383bb1bf00e8bc3e - 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.69231033, y: 0.014350973, z: 0.18444824} - m_Extent: {x: 0.6923094, y: 0.014347076, z: 0.18450928} - 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!43 &1591276225 Mesh: m_ObjectHideFlags: 0 @@ -326512,6 +326642,11 @@ Transform: - {fileID: 180415044} - {fileID: 570555392} - {fileID: 947795177} + - {fileID: 214241218} + - {fileID: 123591708} + - {fileID: 1518388179} + - {fileID: 210049007} + - {fileID: 1009031628} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1688949819 @@ -330584,144 +330719,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6569076738997671329, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} + - {fileID: 1861023319400424536, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} ---- !u!1 &1708351087 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1708351088} - - component: {fileID: 1708351091} - - component: {fileID: 1708351090} - - component: {fileID: 1708351089} - m_Layer: 5 - m_Name: Yes - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1708351088 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1708351087} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.8344, y: 1.8344, z: 1.8344} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 140875955} - m_Father: {fileID: 347656174} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -211, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1708351089 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1708351087} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1708351090} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1312419883} - m_TargetAssemblyTypeName: LeaveHouseTrigger, Assembly-CSharp - m_MethodName: ConfirmLeave - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1708351090 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1708351087} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1708351091 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1708351087} - m_CullTransparentMesh: 1 --- !u!43 &1708599603 Mesh: m_ObjectHideFlags: 0 @@ -333384,7 +333388,7 @@ RectTransform: m_Father: {fileID: 419537269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -346904,6 +346908,10 @@ PrefabInstance: propertyPath: m_Name value: Cigarettes objectReference: {fileID: 0} + - target: {fileID: 1443616761851441618, guid: fafb2d0ef0d778740819bdc583623bd3, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2662862770466917422, guid: fafb2d0ef0d778740819bdc583623bd3, type: 3} propertyPath: m_Mesh value: @@ -348150,6 +348158,10 @@ PrefabInstance: propertyPath: m_Name value: Bottles objectReference: {fileID: 0} + - target: {fileID: 5630556597635509139, guid: e9780caa44a72904897def65e3f50790, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6461864394007631706, guid: e9780caa44a72904897def65e3f50790, type: 3} propertyPath: m_Mesh value: @@ -356275,7 +356287,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Should I leave the house? I might not have completed everything... + m_text: I don't feel like going to school today. m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -356789,6 +356801,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 129092750} + - target: {fileID: 1664691393556969827, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 2323916903307634800, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_LocalScale.y value: 0.96353 @@ -356865,10 +356881,18 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 661698807} + - target: {fileID: 8289180138563017339, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 211916732} + - target: {fileID: 8406702738621133939, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} + propertyPath: m_VersionIndex + value: 2294 + objectReference: {fileID: 0} - target: {fileID: 8655799077491988823, guid: ecfc436532af68e4eb0501d9c25b68c8, type: 3} propertyPath: m_Mesh value: @@ -364211,7 +364235,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 07bcf6161fe191b448235e19f4e7c7a5, type: 3} m_PlayOnAwake: 1 m_Volume: 0.7 m_Pitch: 1 @@ -383237,6 +383261,52 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &2019816213 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2019816215} + - component: {fileID: 2019816214} + m_Layer: 0 + m_Name: Day3 Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2019816214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019816213} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a27efd4a49d700640b2b851f9bf79d00, type: 3} + m_Name: + m_EditorClassIdentifier: + timeToWait: 60 + NextScene: CallingChoice +--- !u!4 &2019816215 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019816213} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 73.4043, y: 20.760696, z: 1067.7833} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2020419528 PrefabInstance: m_ObjectHideFlags: 0 @@ -391464,7 +391534,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2057524443 Transform: m_ObjectHideFlags: 0 @@ -391478,7 +391548,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 214241218} - {fileID: 1039073723} - {fileID: 464365410245868062} - {fileID: 794378890410602329} @@ -391489,10 +391558,6 @@ Transform: - {fileID: 1034675386} - {fileID: 785421758} - {fileID: 1789209493} - - {fileID: 1518388179} - - {fileID: 123591708} - - {fileID: 210049007} - - {fileID: 1009031628} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2057524444 @@ -394576,7 +394641,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 199, y: 0} + m_AnchoredPosition: {x: -4, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2075370363 @@ -406326,6 +406391,10 @@ PrefabInstance: propertyPath: m_Name value: Letter objectReference: {fileID: 0} + - target: {fileID: 647712483686718152, guid: 10ac7c7b9495c7541b204356630b15a5, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 647712483686718152, guid: 10ac7c7b9495c7541b204356630b15a5, type: 3} propertyPath: m_TagString value: InfoObject @@ -406533,6 +406602,10 @@ PrefabInstance: propertyPath: m_Name value: Bottles objectReference: {fileID: 0} + - target: {fileID: 5630556597635509139, guid: e9780caa44a72904897def65e3f50790, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6461864394007631706, guid: e9780caa44a72904897def65e3f50790, type: 3} propertyPath: m_Mesh value: @@ -407640,6 +407713,10 @@ PrefabInstance: propertyPath: m_Name value: Cigarettes objectReference: {fileID: 0} + - target: {fileID: 1443616761851441618, guid: fafb2d0ef0d778740819bdc583623bd3, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2662862770466917422, guid: fafb2d0ef0d778740819bdc583623bd3, type: 3} propertyPath: m_Mesh value: @@ -409108,6 +409185,10 @@ PrefabInstance: propertyPath: m_Name value: Needles objectReference: {fileID: 0} + - target: {fileID: 3510408986590439666, guid: 115e0f30c5ec185489b02437aec67077, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4226959381646210589, guid: 115e0f30c5ec185489b02437aec67077, type: 3} propertyPath: m_Mesh value: @@ -411080,23 +411161,39 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 2057524443} + m_TransformParent: {fileID: 1688857688} m_Modifications: + - target: {fileID: 1861023319400424536, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} + propertyPath: m_Colliders.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4879809269147637565, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} propertyPath: m_Name value: Door_Reza objectReference: {fileID: 0} + - target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} + propertyPath: m_LocalScale.x + value: 0.42614228 + objectReference: {fileID: 0} + - target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} + propertyPath: m_LocalScale.y + value: 33.90807 + objectReference: {fileID: 0} + - target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} + propertyPath: m_LocalScale.z + value: 18.719225 + objectReference: {fileID: 0} - target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} propertyPath: m_LocalPosition.x - value: -3.5287323 + value: -202.68002 objectReference: {fileID: 0} - target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} propertyPath: m_LocalPosition.y - value: 3.1325512 + value: -13.669075 objectReference: {fileID: 0} - target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} propertyPath: m_LocalPosition.z - value: -0.2010498 + value: 13725.45 objectReference: {fileID: 0} - target: {fileID: 7808417053503182586, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} propertyPath: m_LocalRotation.w @@ -412772,3 +412869,6 @@ SceneRoots: - {fileID: 2031915432} - {fileID: 1312419882} - {fileID: 1127428079} + - {fileID: 29017750} + - {fileID: 1254651709} + - {fileID: 2019816215} diff --git a/Game/Assets/Scenes/Calling Choice.unity.meta b/Game/Assets/Scenes/CallingChoice.unity.meta similarity index 74% rename from Game/Assets/Scenes/Calling Choice.unity.meta rename to Game/Assets/Scenes/CallingChoice.unity.meta index 4ebdcf3..8cefa10 100644 --- a/Game/Assets/Scenes/Calling Choice.unity.meta +++ b/Game/Assets/Scenes/CallingChoice.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c39019880a7adc446b8735907158934b +guid: 1d5aef3694675994d910193f9487ad57 DefaultImporter: externalObjects: {} userData: diff --git a/Game/Assets/Scenes/Day3.unity b/Game/Assets/Scenes/Day3.unity index 37a5484..6ec84c1 100644 --- a/Game/Assets/Scenes/Day3.unity +++ b/Game/Assets/Scenes/Day3.unity @@ -4337,7 +4337,7 @@ MonoBehaviour: m_EditorClassIdentifier: storyPanelUI: {fileID: 620624014} storyText: {fileID: 1214791149} - message: I woke up late... my parents already left + message: I woke up late again... I don't feel like going to school today displayDuration: 7 --- !u!4 &29017750 Transform: @@ -26869,140 +26869,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &140875954 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 140875955} - - component: {fileID: 140875957} - - component: {fileID: 140875956} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &140875955 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 140875954} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1708351088} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &140875956 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 140875954} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Yes, leave house. - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &140875957 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 140875954} - m_CullTransparentMesh: 1 --- !u!43 &141008991 Mesh: m_ObjectHideFlags: 0 @@ -38561,22 +38427,22 @@ MonoBehaviour: - serializedVersion: 3 time: 0 value: 0 - inSlope: 2 - outSlope: 2 + inSlope: 1.8466054 + outSlope: 1.8466054 tangentMode: 0 weightedMode: 0 inWeight: 0 - outWeight: 0 + outWeight: 0.024915176 - serializedVersion: 3 - time: 0.5839262 - value: 0.006742792 - inSlope: -3.9736369 - outSlope: -3.9736369 + time: 1.0952759 + value: -0.0050354004 + inSlope: -1.4948272 + outSlope: -1.4948272 tangentMode: 0 weightedMode: 0 - inWeight: 0.015775587 + inWeight: 0.027786292 outWeight: 0 - m_PreInfinity: 2 + m_PreInfinity: 1 m_PostInfinity: 1 m_RotationOrder: 4 chromaticAberrationIntensity: @@ -66111,7 +65977,6 @@ RectTransform: m_LocalScale: {x: 0.0019388271, y: 0.0019388271, z: 0.0019388271} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1708351088} - {fileID: 2075370362} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -135851,7 +135716,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: No, not yet. + m_text: No, not today. m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -246469,6 +246334,73 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &1254651706 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1254651709} + - component: {fileID: 1254651708} + - component: {fileID: 1254651707} + m_Layer: 0 + m_Name: EffectTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1254651707 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254651706} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1254651708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254651706} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b37f04853730f540abd4bedc166c049, type: 3} + m_Name: + m_EditorClassIdentifier: + effectName: Headache +--- !u!4 &1254651709 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254651706} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 76.33916, y: 21.45, z: 1065.1228} + m_LocalScale: {x: 17.59641, y: 4.4528017, z: 12.768409} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1254955191 Mesh: m_ObjectHideFlags: 0 @@ -323434,6 +323366,76 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &1670443773 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1670443776} + - component: {fileID: 1670443775} + - component: {fileID: 1670443774} + m_Layer: 0 + m_Name: MessageTrigger (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1670443774 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1670443773} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1670443775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1670443773} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dd9f95621cce5d4389410717683d6be, type: 3} + m_Name: + m_EditorClassIdentifier: + storyPanelUI: {fileID: 620624014} + storyText: {fileID: 1214791149} + message: I... have no energy... to leave the room + displayDuration: 7 +--- !u!4 &1670443776 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1670443773} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 73.191, y: 20.527, z: 1066.703} + m_LocalScale: {x: 0.5606484, y: 1, z: 1.182047} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1670985259 Mesh: m_ObjectHideFlags: 0 @@ -330794,139 +330796,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} ---- !u!1 &1708351087 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1708351088} - - component: {fileID: 1708351091} - - component: {fileID: 1708351090} - - component: {fileID: 1708351089} - m_Layer: 5 - m_Name: Yes - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1708351088 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1708351087} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.8344, y: 1.8344, z: 1.8344} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 140875955} - m_Father: {fileID: 347656174} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -211, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1708351089 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1708351087} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1708351090} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1312419883} - m_TargetAssemblyTypeName: LeaveHouseTrigger, Assembly-CSharp - m_MethodName: ConfirmLeave - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1708351090 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1708351087} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1708351091 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1708351087} - m_CullTransparentMesh: 1 --- !u!43 &1708599603 Mesh: m_ObjectHideFlags: 0 @@ -356488,7 +356357,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Should I leave the house? I might not have completed everything... + m_text: I don't feel like going to school today. m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -363359,76 +363228,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &1897669666 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1897669669} - - component: {fileID: 1897669668} - - component: {fileID: 1897669667} - m_Layer: 0 - m_Name: MessageTrigger (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &1897669667 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1897669666} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &1897669668 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1897669666} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0dd9f95621cce5d4389410717683d6be, type: 3} - m_Name: - m_EditorClassIdentifier: - storyPanelUI: {fileID: 620624014} - storyText: {fileID: 1214791149} - message: I'm late to school, I don't have time to do anything - displayDuration: 5 ---- !u!4 &1897669669 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1897669666} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 75.388, y: 20.549, z: 1066.734} - m_LocalScale: {x: 1.985814, y: 1, z: 1.0326712} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1898590437 PrefabInstance: m_ObjectHideFlags: 0 @@ -383532,6 +383331,52 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &2019816213 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2019816215} + - component: {fileID: 2019816214} + m_Layer: 0 + m_Name: Day3 Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2019816214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019816213} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a27efd4a49d700640b2b851f9bf79d00, type: 3} + m_Name: + m_EditorClassIdentifier: + timeToWait: 30 + NextScene: CallingChoice +--- !u!4 &2019816215 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019816213} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 73.4043, y: 20.760696, z: 1067.7833} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2020419528 PrefabInstance: m_ObjectHideFlags: 0 @@ -394866,7 +394711,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 199, y: 0} + m_AnchoredPosition: {x: -4, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2075370363 @@ -411448,7 +411293,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 1861023319400424536, guid: dcc1cc3e78ddb4044bec9f02b4f6da63, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -413095,4 +412941,6 @@ SceneRoots: - {fileID: 1312419882} - {fileID: 1127428079} - {fileID: 29017750} - - {fileID: 1897669669} + - {fileID: 1670443776} + - {fileID: 1254651709} + - {fileID: 2019816215} diff --git a/Game/Assets/Scripts/BedroomTask.cs b/Game/Assets/Scripts/BedroomTask.cs index 9486957..1fe1ba1 100644 --- a/Game/Assets/Scripts/BedroomTask.cs +++ b/Game/Assets/Scripts/BedroomTask.cs @@ -251,7 +251,7 @@ public class BedroomTask : MonoBehaviour yield return new WaitForSeconds(doorSlamSound.length); // Stop the panic effect once the door slam sound ends - PostProcessingManager.Instance.StopEffect("Panic"); + PostProcessingManager.Instance.StopEffect(); // Clear the "!!!" storyText.text = ""; diff --git a/Game/Assets/Scripts/Day3.cs b/Game/Assets/Scripts/Day3.cs new file mode 100644 index 0000000..25dc940 --- /dev/null +++ b/Game/Assets/Scripts/Day3.cs @@ -0,0 +1,37 @@ +/* +Author: Reza +Date: 13/2/25 +Description: Day 3 script that goes to the last scene after a certain amount of time +*/ + +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class Day3 : MonoBehaviour +{ + // Time in seconds to wait before transitioning to the next scene + public float timeToWait = 60f; // Change this to the desired wait time + private float timer; + public string NextScene; + + void Start() + { + // Initialize timer + timer = 0f; + } + + void Update() + { + // Increment timer + timer += Time.deltaTime; + + // Check if the time has passed + if (timer >= timeToWait) + { + // Call method to change the scene + GameManager.Instance.IncrementDay(); + } + } +} \ No newline at end of file diff --git a/Game/Assets/Scripts/Day3.cs.meta b/Game/Assets/Scripts/Day3.cs.meta new file mode 100644 index 0000000..d383699 --- /dev/null +++ b/Game/Assets/Scripts/Day3.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a27efd4a49d700640b2b851f9bf79d00 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scripts/EffectTrigger.cs b/Game/Assets/Scripts/EffectTrigger.cs new file mode 100644 index 0000000..8ad8711 --- /dev/null +++ b/Game/Assets/Scripts/EffectTrigger.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EffectTrigger : MonoBehaviour +{ + // The effect name to trigger when the player enters this area + public string effectName; + + // Check if the player enters the trigger zone + private void OnTriggerStay(Collider other) + { + // Check if the player is in the trigger zone + if (other.CompareTag("Player")) + { + // Trigger the effect based on the specified effectName + if (!PostProcessingManager.Instance.IsEffectActive()) + { + PostProcessingManager.Instance.TriggerEffect(effectName); + } + } + } + + // Optionally stop the effect when the player exits the trigger zone + private void OnTriggerExit(Collider other) + { + if (other.CompareTag("Player") && PostProcessingManager.Instance.IsEffectActive()) + { + PostProcessingManager.Instance.StopEffect(); + } + } +} \ No newline at end of file diff --git a/Game/Assets/Scripts/EffectTrigger.cs.meta b/Game/Assets/Scripts/EffectTrigger.cs.meta new file mode 100644 index 0000000..8a7ec73 --- /dev/null +++ b/Game/Assets/Scripts/EffectTrigger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6b37f04853730f540abd4bedc166c049 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scripts/GameManager.cs b/Game/Assets/Scripts/GameManager.cs index f214e6d..2e2a39b 100644 --- a/Game/Assets/Scripts/GameManager.cs +++ b/Game/Assets/Scripts/GameManager.cs @@ -169,6 +169,6 @@ public class GameManager : MonoBehaviour private void LoadCallingScene() { Debug.Log("Loading Calling Scene: callingChoice"); - SceneManager.LoadScene("callingChoice"); + SceneManager.LoadScene("CallingChoice"); } } \ No newline at end of file diff --git a/Game/Assets/Scripts/PostProcessingManager.cs b/Game/Assets/Scripts/PostProcessingManager.cs index 17c8fab..03895dd 100644 --- a/Game/Assets/Scripts/PostProcessingManager.cs +++ b/Game/Assets/Scripts/PostProcessingManager.cs @@ -41,11 +41,14 @@ public class PostProcessingManager : MonoBehaviour private bool isEffectActive = false; // Defines Audio References - [Header("Audio References")] public AudioSource audioSource; + [Header("Audio References")] + public AudioSource audioSource; public AudioClip heartbeatSound; public AudioClip whisperSound; public AudioClip distortedWhisperSound; + // Holds the current effect name to manage stopping and starting dynamically + private string currentEffectName = ""; void Awake() { @@ -70,45 +73,48 @@ public class PostProcessingManager : MonoBehaviour volume.profile.TryGet(out colorAdjustments); } - // Update is called once per frame - void Update() + // Checks if an effect is currently active + public bool IsEffectActive() { - + return isEffectActive; } - // Function to start effects if there is none currently, and stop current effects to start next ones + // Function to trigger effects dynamically based on the effect name passed public void TriggerEffect(string effectName) { - // If an effect is already active + // If an effect is already active, stop the current one if (isEffectActive) { - // Stop the effect - StopEffect(effectName); + StopEffect(currentEffectName); } - // If there's no active effects - else - { - // Start the effect - StartEffect(effectName); - } + // Start the new effect + StartEffect(effectName); } - // Function to start the effect + // Start a specific effect public void StartEffect(string effectName) { - // The effect is active isEffectActive = true; + currentEffectName = effectName; - // Calls coroutine to apply the effect StartCoroutine(ApplyEffect(effectName)); } - // Function to stop the effect - public void StopEffect(string effectName) + // Stop the active effect + public void StopEffect() + { + if (isEffectActive) + { + StopEffect(currentEffectName); + } + } + + // Stop a specific effect + private void StopEffect(string effectName) { - // The effect is not active isEffectActive = false; + currentEffectName = ""; // Reset effects to default if (vignette != null) vignette.intensity.Override(0f); @@ -117,17 +123,17 @@ public class PostProcessingManager : MonoBehaviour if (lensDistortion != null) lensDistortion.intensity.Override(0f); if (colorAdjustments != null) colorAdjustments.postExposure.Override(0f); - // Stop audio + // Stop the audio if (audioSource != null) { audioSource.Stop(); } } - // Applies effects over time based on the type + // Applies effects over time based on the effect name private IEnumerator ApplyEffect(string effectName) { - // Handle the audio for the effect + // Handle audio for the effect if (effectName == "Panic") { audioSource.clip = heartbeatSound; @@ -171,10 +177,11 @@ public class PostProcessingManager : MonoBehaviour lensDistortion.intensity.Override(lensDistortionIntensity.Evaluate(Time.time)); chromaticAberration.intensity.Override(chromaticAberrationIntensity.Evaluate(Time.time)); } + yield return null; } - // Stop audio when the effect ends + // Stop audio after the effect ends if (audioSource != null && audioSource.isPlaying) { audioSource.Stop();