From 0bf8adc76db5d180aa4aa05d1b5995895e4b7cb0 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 29 Jan 2025 14:28:17 +0100 Subject: [PATCH] Added ticks to show progress through the monster rooms. --- .../Assets/Prefabs/Rooms/Monster Room.prefab | 243 +++++++++++++- PuzzleGameProject/Assets/Scenes/Level_0.unity | 312 ++++++++++++++++-- .../Assets/Scripts/Rooms/Monster Room.cs | 23 +- 3 files changed, 551 insertions(+), 27 deletions(-) diff --git a/PuzzleGameProject/Assets/Prefabs/Rooms/Monster Room.prefab b/PuzzleGameProject/Assets/Prefabs/Rooms/Monster Room.prefab index e2952a8..844685f 100644 --- a/PuzzleGameProject/Assets/Prefabs/Rooms/Monster Room.prefab +++ b/PuzzleGameProject/Assets/Prefabs/Rooms/Monster Room.prefab @@ -1,5 +1,80 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1735603092438910357 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2350009719861052788} + - component: {fileID: 286217537584344082} + - component: {fileID: 5126110704028324915} + m_Layer: 0 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2350009719861052788 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735603092438910357} + 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: 1764876241474559387} + 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: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &286217537584344082 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735603092438910357} + m_CullTransparentMesh: 1 +--- !u!114 &5126110704028324915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735603092438910357} + 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: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + 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!1 &2435349004046080434 GameObject: m_ObjectHideFlags: 0 @@ -50,9 +125,9 @@ MonoBehaviour: m_EditorClassIdentifier: adjacentRooms: [] isEntrance: 0 - keyType: 0 - locks: numberTextObject: {fileID: 8119019481281764985} + healthTickObject: {fileID: 2885337975627474754} + _health: 0 --- !u!212 &1770509300873928573 SpriteRenderer: m_ObjectHideFlags: 0 @@ -169,6 +244,167 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 1, b: 0.09941673, a: 0.5} m_EffectDistance: {x: 10, y: 10} m_UseGraphicAlpha: 1 +--- !u!1 &2846330325476652680 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1764876241474559387} + - component: {fileID: 7181831331141731840} + - component: {fileID: 1847420437976641395} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1764876241474559387 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2846330325476652680} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 10, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2350009719861052788} + m_Father: {fileID: 244121025600760136} + 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: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7181831331141731840 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2846330325476652680} + m_CullTransparentMesh: 1 +--- !u!114 &1847420437976641395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2846330325476652680} + 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!1 &2885337975627474754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 244121025600760136} + - component: {fileID: 8929257494273614377} + m_Layer: 0 + m_Name: HealthTick + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &244121025600760136 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2885337975627474754} + 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: 1764876241474559387} + m_Father: {fileID: 2539620726141895785} + 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: 486.7102, y: 253} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8929257494273614377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2885337975627474754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 0 + 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: 0 + m_TargetGraphic: {fileID: 1847420437976641395} + toggleTransition: 1 + graphic: {fileID: 5126110704028324915} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 0 --- !u!1 &7488793311042651820 GameObject: m_ObjectHideFlags: 0 @@ -182,7 +418,7 @@ GameObject: - component: {fileID: 8840412798147865769} - component: {fileID: 3878377942961622899} m_Layer: 0 - m_Name: NumberCanvas + m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -201,6 +437,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6916722731958000395} + - {fileID: 244121025600760136} m_Father: {fileID: 9187907134033443523} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/PuzzleGameProject/Assets/Scenes/Level_0.unity b/PuzzleGameProject/Assets/Scenes/Level_0.unity index 3072a2d..5f63519 100644 --- a/PuzzleGameProject/Assets/Scenes/Level_0.unity +++ b/PuzzleGameProject/Assets/Scenes/Level_0.unity @@ -185,8 +185,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -342,7 +342,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 794442994} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1 &59409725 GameObject: @@ -576,7 +579,16 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: dffcf67f187414eacb9e7abf6d8cf39b, type: 3} + insertIndex: -1 + addedObject: {fileID: 112566364} + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: dffcf67f187414eacb9e7abf6d8cf39b, type: 3} + insertIndex: -1 + addedObject: {fileID: 112566363} + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: dffcf67f187414eacb9e7abf6d8cf39b, type: 3} + insertIndex: -1 + addedObject: {fileID: 112566362} m_SourcePrefab: {fileID: 100100000, guid: dffcf67f187414eacb9e7abf6d8cf39b, type: 3} --- !u!1 &112566356 stripped GameObject: @@ -588,6 +600,45 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: dffcf67f187414eacb9e7abf6d8cf39b, type: 3} m_PrefabInstance: {fileID: 112566355} m_PrefabAsset: {fileID: 0} +--- !u!114 &112566362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 112566356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 3 +--- !u!114 &112566363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 112566356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 4 +--- !u!114 &112566364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 112566356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 11 --- !u!1 &126339301 GameObject: m_ObjectHideFlags: 0 @@ -1076,7 +1127,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 1114080353} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1 &433171258 stripped GameObject: @@ -1093,6 +1147,19 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 1491801440} m_PrefabAsset: {fileID: 0} +--- !u!114 &497017786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497017778} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 12 --- !u!1001 &588715899 PrefabInstance: m_ObjectHideFlags: 0 @@ -1164,7 +1231,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 588715906} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1 &588715900 stripped GameObject: @@ -1176,6 +1246,19 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 588715899} m_PrefabAsset: {fileID: 0} +--- !u!114 &588715906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 588715900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 3 --- !u!1001 &604573511 PrefabInstance: m_ObjectHideFlags: 0 @@ -1287,7 +1370,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 1920563653} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1 &669248219 stripped GameObject: @@ -1299,6 +1385,19 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 2949504431378540094} m_PrefabAsset: {fileID: 0} +--- !u!114 &669248227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 669248219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 9 --- !u!1 &759514214 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} @@ -1309,6 +1408,19 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 1403062838} m_PrefabAsset: {fileID: 0} +--- !u!114 &759514222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759514214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 5 --- !u!1 &794442986 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} @@ -1319,6 +1431,19 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 54550404} m_PrefabAsset: {fileID: 0} +--- !u!114 &794442994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 794442986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 4 --- !u!1 &812815653 GameObject: m_ObjectHideFlags: 0 @@ -1945,7 +2070,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 1572334883} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1 &943630894 GameObject: @@ -2013,8 +2141,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2206,7 +2334,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 1891656381} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1001 &968551491 PrefabInstance: @@ -2311,7 +2442,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 1693613382} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1 &1015328860 stripped GameObject: @@ -2405,7 +2539,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 1544302711} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1 &1114080345 stripped GameObject: @@ -2417,6 +2554,19 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 408992220} m_PrefabAsset: {fileID: 0} +--- !u!114 &1114080353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1114080345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 10 --- !u!1001 &1141848844 PrefabInstance: m_ObjectHideFlags: 0 @@ -2622,7 +2772,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 1175277330} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1 &1175277324 stripped GameObject: @@ -2634,6 +2787,19 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 1175277323} m_PrefabAsset: {fileID: 0} +--- !u!114 &1175277330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1175277324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 7 --- !u!1001 &1181921798 PrefabInstance: m_ObjectHideFlags: 0 @@ -2967,7 +3133,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 759514222} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1 &1420260829 stripped GameObject: @@ -2979,6 +3148,18 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 1488361738} m_PrefabAsset: {fileID: 0} +--- !u!114 &1420260835 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1420260829} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b40cbe88356086a49b6bc7dc8ff549c0, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1476127624 GameObject: m_ObjectHideFlags: 0 @@ -3046,10 +3227,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1820284206} m_Modifications: - - target: {fileID: -1465197196826248026, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - target: {fileID: 849256457500513523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} propertyPath: keyType value: 1 @@ -3133,7 +3310,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 1420260835} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1001 &1491801440 PrefabInstance: @@ -3230,7 +3410,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 497017786} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1 &1502981336 GameObject: @@ -3453,6 +3636,19 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 1093117749} m_PrefabAsset: {fileID: 0} +--- !u!114 &1544302711 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544302703} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 6 --- !u!1001 &1559063330 PrefabInstance: m_ObjectHideFlags: 0 @@ -3581,6 +3777,19 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 939997327} m_PrefabAsset: {fileID: 0} +--- !u!114 &1572334883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1572334875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 6 --- !u!1 &1693613374 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} @@ -3591,6 +3800,19 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 968551491} m_PrefabAsset: {fileID: 0} +--- !u!114 &1693613382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1693613374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 7 --- !u!1001 &1804569631 PrefabInstance: m_ObjectHideFlags: 0 @@ -3782,6 +4004,19 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 944208634} m_PrefabAsset: {fileID: 0} +--- !u!114 &1891656381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1891656373} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 2 --- !u!1 &1920563645 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} @@ -3792,6 +4027,19 @@ Transform: m_CorrespondingSourceObject: {fileID: 9187907134033443523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 604573511} m_PrefabAsset: {fileID: 0} +--- !u!114 &1920563653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1920563645} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} + m_Name: + m_EditorClassIdentifier: + number: 3 --- !u!1001 &1993653463 PrefabInstance: m_ObjectHideFlags: 0 @@ -3859,7 +4107,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 1993653470} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!4 &1993653464 stripped Transform: @@ -3871,6 +4122,18 @@ GameObject: m_CorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} m_PrefabInstance: {fileID: 1993653463} m_PrefabAsset: {fileID: 0} +--- !u!114 &1993653470 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993653465} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b40cbe88356086a49b6bc7dc8ff549c0, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2048429964 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6167039396952026974, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3} @@ -3979,7 +4242,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2435349004046080434, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + insertIndex: -1 + addedObject: {fileID: 669248227} m_SourcePrefab: {fileID: 100100000, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} --- !u!1001 &3593554174308038844 PrefabInstance: diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/Monster Room.cs b/PuzzleGameProject/Assets/Scripts/Rooms/Monster Room.cs index 88b8b2d..5f2e9ae 100644 --- a/PuzzleGameProject/Assets/Scripts/Rooms/Monster Room.cs +++ b/PuzzleGameProject/Assets/Scripts/Rooms/Monster Room.cs @@ -2,12 +2,16 @@ using UnityEngine; using System.Collections.Generic; using System.Linq; using TMPro; +using UnityEngine.UIElements; +using Toggle = UnityEngine.UI.Toggle; public class MonsterRoom : Room { [SerializeField] private GameObject numberTextObject; + [SerializeField] private GameObject healthTickObject; [SerializeField] private int _health; // Number of times the room needs to be unlocked before becoming explored. + private GameObject[] _healthTicks; protected override void InitializeRoom() { base.InitializeRoom(); @@ -19,6 +23,14 @@ public class MonsterRoom : Room lockToDuplicate = DuplicateToTheLeft(lockToDuplicate, ((RectTransform)lockToDuplicate.transform).rect.width); lockToDuplicate.GetComponent().text = ((NumberLock)_locks[i]).GetNumber().ToString(); } + + _healthTicks = new GameObject[_health]; + _healthTicks[0] = healthTickObject; + for (int i = 1; i < _health; i++) + { + _healthTicks[i] = DuplicateDown(_healthTicks[i - 1], + ((RectTransform)_healthTicks[i - 1].transform).rect.height); + } } public override bool TryUnlock(DicePair pair) { @@ -33,7 +45,9 @@ public class MonsterRoom : Room return false; } - public override void SetRoomExplored() { + public override void SetRoomExplored() + { + _healthTicks[^_health].GetComponent().isOn = true; // Toggles the corresponding health tick _health -= 1; if (_health == 0) { @@ -49,4 +63,11 @@ public class MonsterRoom : Room clone.transform.localPosition -= new Vector3(offset, 0, 0); return clone; } + + private GameObject DuplicateDown(GameObject original, float offset) + { + GameObject clone = Instantiate(original, original.transform.parent); + clone.transform.localPosition -= new Vector3(0, offset, 0); + return clone; + } }