From d79d6216f062def9985d4ac71f7e118e6b818450 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 29 Jan 2025 12:02:00 +0100 Subject: [PATCH 1/3] Refactored locks for rooms to be more versatile by giving them their own type. --- PuzzleGameProject/Assets/Scripts/DicePair.cs | 2 +- .../Assets/Scripts/Rooms/EmptyRoom.cs | 26 +++---------------- PuzzleGameProject/Assets/Scripts/Rooms/Key.cs | 16 ------------ .../Assets/Scripts/Rooms/Key.cs.meta | 2 -- .../Assets/Scripts/Rooms/Locks.meta | 8 ++++++ .../Assets/Scripts/Rooms/Locks/Lock.cs | 23 ++++++++++++++++ .../Assets/Scripts/Rooms/Locks/Lock.cs.meta | 2 ++ .../Scripts/Rooms/Locks/MatchingDiceLock.cs | 15 +++++++++++ .../Rooms/Locks/MatchingDiceLock.cs.meta | 2 ++ .../Assets/Scripts/Rooms/Locks/NumberLock.cs | 21 +++++++++++++++ .../Scripts/Rooms/Locks/NumberLock.cs.meta | 2 ++ .../Assets/Scripts/Rooms/Monster Room.cs | 11 ++++---- .../Assets/Scripts/Rooms/Room.cs | 8 ++---- 13 files changed, 85 insertions(+), 53 deletions(-) delete mode 100644 PuzzleGameProject/Assets/Scripts/Rooms/Key.cs delete mode 100644 PuzzleGameProject/Assets/Scripts/Rooms/Key.cs.meta create mode 100644 PuzzleGameProject/Assets/Scripts/Rooms/Locks.meta create mode 100644 PuzzleGameProject/Assets/Scripts/Rooms/Locks/Lock.cs create mode 100644 PuzzleGameProject/Assets/Scripts/Rooms/Locks/Lock.cs.meta create mode 100644 PuzzleGameProject/Assets/Scripts/Rooms/Locks/MatchingDiceLock.cs create mode 100644 PuzzleGameProject/Assets/Scripts/Rooms/Locks/MatchingDiceLock.cs.meta create mode 100644 PuzzleGameProject/Assets/Scripts/Rooms/Locks/NumberLock.cs create mode 100644 PuzzleGameProject/Assets/Scripts/Rooms/Locks/NumberLock.cs.meta diff --git a/PuzzleGameProject/Assets/Scripts/DicePair.cs b/PuzzleGameProject/Assets/Scripts/DicePair.cs index f5d21ec..d9a6d90 100644 --- a/PuzzleGameProject/Assets/Scripts/DicePair.cs +++ b/PuzzleGameProject/Assets/Scripts/DicePair.cs @@ -70,7 +70,7 @@ public class DicePair return _pair.Item1.GetResult() + _pair.Item2.GetResult(); } - public bool DoResultsMatch() + public bool CheckIfResultsMatch() { if (_pair.Item1.GetResult() == _pair.Item2.GetResult()) { diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/EmptyRoom.cs b/PuzzleGameProject/Assets/Scripts/Rooms/EmptyRoom.cs index 4e8733f..33db505 100644 --- a/PuzzleGameProject/Assets/Scripts/Rooms/EmptyRoom.cs +++ b/PuzzleGameProject/Assets/Scripts/Rooms/EmptyRoom.cs @@ -4,16 +4,15 @@ using UnityEngine; public class EmptyRoom : Room { [SerializeField] private GameObject numberTextObject; - [SerializeField] private int number; protected override void InitializeRoom() { base.InitializeRoom(); TextMeshProUGUI numberText = numberTextObject.GetComponent(); - if (keyType == KeyType.Number) + if (_locks[0] is NumberLock ) { - numberText.SetText(number.ToString()); + numberText.SetText(((NumberLock)_locks[0]).GetNumber().ToString()); } - else if (keyType == KeyType.MatchingDice) + else if (_locks[0] is MatchingDiceLock) { numberText.SetText("="); } @@ -21,24 +20,7 @@ public class EmptyRoom : Room public override bool TryUnlock(DicePair pair) { - switch (keyType) - { - case KeyType.Number: - if (number == pair.Sum()) - { - return true; - } - return false; - case KeyType.MatchingDice: - if (pair.DoResultsMatch()) - { - return true; - } - - return false; - } - - return false; + return _locks[0].CheckIfKeyFits(pair); } public override void SetRoomExplored() { diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/Key.cs b/PuzzleGameProject/Assets/Scripts/Rooms/Key.cs deleted file mode 100644 index f089d6a..0000000 --- a/PuzzleGameProject/Assets/Scripts/Rooms/Key.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UnityEngine; - -public class Key : MonoBehaviour -{ - // Start is called once before the first execution of Update after the MonoBehaviour is created - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/Key.cs.meta b/PuzzleGameProject/Assets/Scripts/Rooms/Key.cs.meta deleted file mode 100644 index aa192f0..0000000 --- a/PuzzleGameProject/Assets/Scripts/Rooms/Key.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 65db8ffa325fb48e89716418fa310bca \ No newline at end of file diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/Locks.meta b/PuzzleGameProject/Assets/Scripts/Rooms/Locks.meta new file mode 100644 index 0000000..b1abf87 --- /dev/null +++ b/PuzzleGameProject/Assets/Scripts/Rooms/Locks.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a3af0e06c321aa8458a492be0ed8db63 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/Locks/Lock.cs b/PuzzleGameProject/Assets/Scripts/Rooms/Locks/Lock.cs new file mode 100644 index 0000000..21fd76c --- /dev/null +++ b/PuzzleGameProject/Assets/Scripts/Rooms/Locks/Lock.cs @@ -0,0 +1,23 @@ +using System; +using Unity.VisualScripting; +using UnityEngine; + +public abstract class Lock : MonoBehaviour +{ + public event Action Unlocked; + + public abstract bool CheckIfKeyFits(DicePair dicePair); + + public virtual void Unlock(DicePair dicePair) + { + if (CheckIfKeyFits(dicePair)) + { + OnUnlock(); + } + } + + protected virtual void OnUnlock() + { + Unlocked?.Invoke(); + } +} diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/Locks/Lock.cs.meta b/PuzzleGameProject/Assets/Scripts/Rooms/Locks/Lock.cs.meta new file mode 100644 index 0000000..2465c45 --- /dev/null +++ b/PuzzleGameProject/Assets/Scripts/Rooms/Locks/Lock.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b665fd3798293ac4e9eb870c53c878a0 \ No newline at end of file diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/Locks/MatchingDiceLock.cs b/PuzzleGameProject/Assets/Scripts/Rooms/Locks/MatchingDiceLock.cs new file mode 100644 index 0000000..309c1c4 --- /dev/null +++ b/PuzzleGameProject/Assets/Scripts/Rooms/Locks/MatchingDiceLock.cs @@ -0,0 +1,15 @@ +using Unity.VisualScripting; +using UnityEngine; + +public class MatchingDiceLock : Lock +{ + public override bool CheckIfKeyFits(DicePair dicePair) + { + if (dicePair.CheckIfResultsMatch()) + { + return true; + } + + return false; + } +} diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/Locks/MatchingDiceLock.cs.meta b/PuzzleGameProject/Assets/Scripts/Rooms/Locks/MatchingDiceLock.cs.meta new file mode 100644 index 0000000..da20eae --- /dev/null +++ b/PuzzleGameProject/Assets/Scripts/Rooms/Locks/MatchingDiceLock.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b40cbe88356086a49b6bc7dc8ff549c0 \ No newline at end of file diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/Locks/NumberLock.cs b/PuzzleGameProject/Assets/Scripts/Rooms/Locks/NumberLock.cs new file mode 100644 index 0000000..75765cc --- /dev/null +++ b/PuzzleGameProject/Assets/Scripts/Rooms/Locks/NumberLock.cs @@ -0,0 +1,21 @@ +using UnityEngine; + +public class NumberLock : Lock +{ + [SerializeField] private int number; + + public override bool CheckIfKeyFits(DicePair dicePair) + { + if (dicePair.Sum() == number) + { + return true; + } + + return false; + } + + public int GetNumber() + { + return number; + } +} diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/Locks/NumberLock.cs.meta b/PuzzleGameProject/Assets/Scripts/Rooms/Locks/NumberLock.cs.meta new file mode 100644 index 0000000..57b3493 --- /dev/null +++ b/PuzzleGameProject/Assets/Scripts/Rooms/Locks/NumberLock.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0f021f4903d50cb4b8bea2c40701ad58 \ No newline at end of file diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/Monster Room.cs b/PuzzleGameProject/Assets/Scripts/Rooms/Monster Room.cs index 8ceb97e..88b8b2d 100644 --- a/PuzzleGameProject/Assets/Scripts/Rooms/Monster Room.cs +++ b/PuzzleGameProject/Assets/Scripts/Rooms/Monster Room.cs @@ -5,7 +5,6 @@ using TMPro; public class MonsterRoom : Room { - [SerializeField] private List locks = new(); [SerializeField] private GameObject numberTextObject; [SerializeField] private int _health; // Number of times the room needs to be unlocked before becoming explored. @@ -13,19 +12,19 @@ public class MonsterRoom : Room base.InitializeRoom(); // Create the lock numbers on the room. - numberTextObject.GetComponent().text = locks[0].ToString(); + numberTextObject.GetComponent().text = ((NumberLock)_locks[0]).GetNumber().ToString(); GameObject lockToDuplicate = numberTextObject; - for (int i = 1; i < locks.Count; i++) + for (int i = 1; i < _locks.Length; i++) { lockToDuplicate = DuplicateToTheLeft(lockToDuplicate, ((RectTransform)lockToDuplicate.transform).rect.width); - lockToDuplicate.GetComponent().text = locks[i].ToString(); + lockToDuplicate.GetComponent().text = ((NumberLock)_locks[i]).GetNumber().ToString(); } } public override bool TryUnlock(DicePair pair) { - foreach (int lockNumber in locks) + foreach (NumberLock numberLock in _locks) { - if (pair.Sum() == lockNumber) + if (pair.Sum() == numberLock.GetNumber()) { return true; } diff --git a/PuzzleGameProject/Assets/Scripts/Rooms/Room.cs b/PuzzleGameProject/Assets/Scripts/Rooms/Room.cs index d17484f..190fda0 100644 --- a/PuzzleGameProject/Assets/Scripts/Rooms/Room.cs +++ b/PuzzleGameProject/Assets/Scripts/Rooms/Room.cs @@ -5,21 +5,16 @@ using UnityEngine; using System.Collections.Generic; using Unity.VisualScripting; -public enum KeyType -{ - Number, - MatchingDice -} public abstract class Room : MonoBehaviour { [SerializeField] private List adjacentRooms; [SerializeField] private bool isEntrance; - [SerializeField] protected KeyType keyType; public event EventHandler ValidRoomClicked; private Color _roomNumberOriginalColor; protected bool _isExplored = false; + protected Lock[] _locks; private bool _isClickable = true; private void OnEnable() { @@ -46,6 +41,7 @@ public abstract class Room : MonoBehaviour if (isEntrance) { SetPropertiesOfEntrance(); } + _locks = gameObject.GetComponents(); } protected void HighlightRoomAsOption() From 0bf8adc76db5d180aa4aa05d1b5995895e4b7cb0 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 29 Jan 2025 14:28:17 +0100 Subject: [PATCH 2/3] 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; + } } From 9a8077021af49ddd1d6a65c2cb03474a57958a49 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 30 Jan 2025 11:05:39 +0100 Subject: [PATCH 3/3] Implemented torch ability --- .../Assets/Prefabs/Abilities.meta | 8 + .../{ => Abilities}/BlackDieAbiliy.prefab | 0 .../BlackDieAbiliy.prefab.meta | 0 .../Prefabs/Abilities/TorchAbilityUse.prefab | 259 ++++++++++ .../Abilities/TorchAbilityUse.prefab.meta | 7 + PuzzleGameProject/Assets/Scenes/Level_0.unity | 453 +++++++++++++++++- .../Scripts/Abilities/BlackDieAbility.cs | 2 +- .../Assets/Scripts/Abilities/TorchAbility.cs | 58 +++ .../Scripts/Abilities/TorchAbility.cs.meta | 2 + .../Assets/Scripts/GameManager.cs | 34 +- .../Assets/Scripts/Rooms/Locks/Lock.cs | 13 +- .../Scripts/Rooms/Locks/MatchingDiceLock.cs | 2 +- .../Assets/Scripts/Rooms/Locks/NumberLock.cs | 2 +- .../Assets/Scripts/Rooms/Monster Room.cs | 2 +- .../Assets/Scripts/Rooms/Room.cs | 88 +++- 15 files changed, 881 insertions(+), 49 deletions(-) create mode 100644 PuzzleGameProject/Assets/Prefabs/Abilities.meta rename PuzzleGameProject/Assets/Prefabs/{ => Abilities}/BlackDieAbiliy.prefab (100%) rename PuzzleGameProject/Assets/Prefabs/{ => Abilities}/BlackDieAbiliy.prefab.meta (100%) create mode 100644 PuzzleGameProject/Assets/Prefabs/Abilities/TorchAbilityUse.prefab create mode 100644 PuzzleGameProject/Assets/Prefabs/Abilities/TorchAbilityUse.prefab.meta create mode 100644 PuzzleGameProject/Assets/Scripts/Abilities/TorchAbility.cs create mode 100644 PuzzleGameProject/Assets/Scripts/Abilities/TorchAbility.cs.meta diff --git a/PuzzleGameProject/Assets/Prefabs/Abilities.meta b/PuzzleGameProject/Assets/Prefabs/Abilities.meta new file mode 100644 index 0000000..4400587 --- /dev/null +++ b/PuzzleGameProject/Assets/Prefabs/Abilities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a4e1c5deae88ba542be379f34514fd90 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Prefabs/BlackDieAbiliy.prefab b/PuzzleGameProject/Assets/Prefabs/Abilities/BlackDieAbiliy.prefab similarity index 100% rename from PuzzleGameProject/Assets/Prefabs/BlackDieAbiliy.prefab rename to PuzzleGameProject/Assets/Prefabs/Abilities/BlackDieAbiliy.prefab diff --git a/PuzzleGameProject/Assets/Prefabs/BlackDieAbiliy.prefab.meta b/PuzzleGameProject/Assets/Prefabs/Abilities/BlackDieAbiliy.prefab.meta similarity index 100% rename from PuzzleGameProject/Assets/Prefabs/BlackDieAbiliy.prefab.meta rename to PuzzleGameProject/Assets/Prefabs/Abilities/BlackDieAbiliy.prefab.meta diff --git a/PuzzleGameProject/Assets/Prefabs/Abilities/TorchAbilityUse.prefab b/PuzzleGameProject/Assets/Prefabs/Abilities/TorchAbilityUse.prefab new file mode 100644 index 0000000..380dc70 --- /dev/null +++ b/PuzzleGameProject/Assets/Prefabs/Abilities/TorchAbilityUse.prefab @@ -0,0 +1,259 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5293741749250652686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4874973863404433756} + - component: {fileID: 1855216729025243642} + - component: {fileID: 6494629451359164186} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4874973863404433756 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5293741749250652686} + 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: 8989188457857827130} + 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!222 &1855216729025243642 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5293741749250652686} + m_CullTransparentMesh: 1 +--- !u!114 &6494629451359164186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5293741749250652686} + 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: + 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: 24 + m_fontSizeBase: 24 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &6167039396952026974 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8989188457857827130} + - component: {fileID: 7568565659390603518} + - component: {fileID: 9157113186282288804} + - component: {fileID: 1648245930821754079} + m_Layer: 0 + m_Name: TorchAbilityUse + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8989188457857827130 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167039396952026974} + 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: 4874973863404433756} + m_Father: {fileID: 0} + 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: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7568565659390603518 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167039396952026974} + m_CullTransparentMesh: 1 +--- !u!114 &9157113186282288804 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167039396952026974} + 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: 0.8962264, g: 0.07186722, b: 0.07186722, 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: 0 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1648245930821754079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167039396952026974} + 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: 9157113186282288804} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/PuzzleGameProject/Assets/Prefabs/Abilities/TorchAbilityUse.prefab.meta b/PuzzleGameProject/Assets/Prefabs/Abilities/TorchAbilityUse.prefab.meta new file mode 100644 index 0000000..002bfa7 --- /dev/null +++ b/PuzzleGameProject/Assets/Prefabs/Abilities/TorchAbilityUse.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5e46b071ca9c11745a7893c22faf6976 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/PuzzleGameProject/Assets/Scenes/Level_0.unity b/PuzzleGameProject/Assets/Scenes/Level_0.unity index 5f63519..4963115 100644 --- a/PuzzleGameProject/Assets/Scenes/Level_0.unity +++ b/PuzzleGameProject/Assets/Scenes/Level_0.unity @@ -612,6 +612,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 588715910} number: 3 --- !u!114 &112566363 MonoBehaviour: @@ -625,6 +626,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 794442998} number: 4 --- !u!114 &112566364 MonoBehaviour: @@ -638,6 +640,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 11 --- !u!1 &126339301 GameObject: @@ -683,7 +686,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85fe57d438ef1ec4fa8b36b9c17c11a4, type: 3} m_Name: m_EditorClassIdentifier: - state: 0 rooms: {fileID: 1820284205} diceRoller: {fileID: 150116548} passManager: {fileID: 895359724} @@ -1032,6 +1034,142 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &281533970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 281533971} + - component: {fileID: 281533973} + - component: {fileID: 281533972} + m_Layer: 0 + m_Name: AbilityText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &281533971 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 281533970} + 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: 1502981337} + 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: -1.7771, y: 12.086} + m_SizeDelta: {x: 103.5541, y: 24.1728} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &281533972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 281533970} + 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: Torch + 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: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 21.8 + m_fontSizeBase: 21.8 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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 &281533973 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 281533970} + m_CullTransparentMesh: 1 --- !u!1001 &408992220 PrefabInstance: m_ObjectHideFlags: 0 @@ -1159,6 +1297,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 12 --- !u!1001 &588715899 PrefabInstance: @@ -1258,7 +1397,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 3 +--- !u!114 &588715910 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 849256457500513523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + m_PrefabInstance: {fileID: 588715899} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 588715900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a0eb90a8b6576487b8e5fac5c80e781d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &604573511 PrefabInstance: m_ObjectHideFlags: 0 @@ -1397,6 +1548,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 9 --- !u!1 &759514214 stripped GameObject: @@ -1420,6 +1572,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 5 --- !u!1 &794442986 stripped GameObject: @@ -1443,7 +1596,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 4 +--- !u!114 &794442998 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 849256457500513523, guid: 92d87e25cc40b3e448e62e8ba0328315, type: 3} + m_PrefabInstance: {fileID: 54550404} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 794442986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a0eb90a8b6576487b8e5fac5c80e781d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &812815653 GameObject: m_ObjectHideFlags: 0 @@ -1889,7 +2054,7 @@ Transform: m_GameObject: {fileID: 917054543} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 87.37714, y: 73.96353, z: -3.3417058} + m_LocalPosition: {x: -57.19168, y: -76.51468, z: -3.3417058} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1897,7 +2062,7 @@ Transform: - {fileID: 3593554174308038845} - {fileID: 823517838} - {fileID: 1399634513} - m_Father: {fileID: 1814492475} + m_Father: {fileID: 1502981337} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &917054545 MonoBehaviour: @@ -1914,7 +2079,6 @@ MonoBehaviour: abilityUseOne: {fileID: 1015328860} abilityUseTwo: {fileID: 2048429964} abilityUseThree: {fileID: 433171258} - _uses: 3 --- !u!1 &925126051 GameObject: m_ObjectHideFlags: 0 @@ -2566,6 +2730,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 10 --- !u!1001 &1141848844 PrefabInstance: @@ -2799,6 +2964,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 7 --- !u!1001 &1181921798 PrefabInstance: @@ -2902,6 +3068,113 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1556923700715053098, guid: ca942b415faef4e1ca2ca32043893efd, type: 3} m_PrefabInstance: {fileID: 1181921798} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1196747673 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2063318669} + m_Modifications: + - target: {fileID: 6167039396952026974, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_Name + value: TorchUseOne + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_SizeDelta.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_AnchoredPosition.x + value: -20.9 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_AnchoredPosition.y + value: -26.012 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} +--- !u!224 &1196747674 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + m_PrefabInstance: {fileID: 1196747673} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1196747675 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6167039396952026974, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + m_PrefabInstance: {fileID: 1196747673} + m_PrefabAsset: {fileID: 0} --- !u!1 &1399634512 GameObject: m_ObjectHideFlags: 0 @@ -3160,6 +3433,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b40cbe88356086a49b6bc7dc8ff549c0, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} --- !u!1 &1476127624 GameObject: m_ObjectHideFlags: 0 @@ -3444,7 +3718,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 917054544} + - {fileID: 2063318669} + - {fileID: 281533971} m_Father: {fileID: 1814492475} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -3648,6 +3925,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 6 --- !u!1001 &1559063330 PrefabInstance: @@ -3789,6 +4067,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 6 --- !u!1 &1693613374 stripped GameObject: @@ -3812,6 +4091,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 7 --- !u!1001 &1804569631 PrefabInstance: @@ -3945,7 +4225,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1502981337} - - {fileID: 917054544} m_Father: {fileID: 281326036} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1820284205 @@ -4016,6 +4295,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 2 --- !u!1 &1920563645 stripped GameObject: @@ -4039,7 +4319,115 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f021f4903d50cb4b8bea2c40701ad58, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} number: 3 +--- !u!1001 &1981531724 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2063318669} + m_Modifications: + - target: {fileID: 6167039396952026974, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_Name + value: TorchUseTwo + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_SizeDelta.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_AnchoredPosition.x + value: 20.2 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_AnchoredPosition.y + value: -26.012 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} +--- !u!224 &1981531725 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8989188457857827130, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + m_PrefabInstance: {fileID: 1981531724} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1981531726 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6167039396952026974, guid: 5e46b071ca9c11745a7893c22faf6976, type: 3} + m_PrefabInstance: {fileID: 1981531724} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1993653463 PrefabInstance: m_ObjectHideFlags: 0 @@ -4134,11 +4522,64 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b40cbe88356086a49b6bc7dc8ff549c0, type: 3} m_Name: m_EditorClassIdentifier: + blockingRoom: {fileID: 0} --- !u!1 &2048429964 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6167039396952026974, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3} m_PrefabInstance: {fileID: 3593554174308038844} m_PrefabAsset: {fileID: 0} +--- !u!1 &2063318668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2063318669} + - component: {fileID: 2063318670} + m_Layer: 0 + m_Name: TorchAbility + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2063318669 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2063318668} + 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: 1196747674} + - {fileID: 1981531725} + m_Father: {fileID: 1502981337} + 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: 8.988} + m_SizeDelta: {x: 100, y: 82.024} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2063318670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2063318668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a942e4ca1244b054b8ca96ded24fb63a, type: 3} + m_Name: + m_EditorClassIdentifier: + abilityUseOne: {fileID: 1196747675} + abilityUseTwo: {fileID: 1981531726} --- !u!1001 &2949504431378540094 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/PuzzleGameProject/Assets/Scripts/Abilities/BlackDieAbility.cs b/PuzzleGameProject/Assets/Scripts/Abilities/BlackDieAbility.cs index 064117c..c0a2dbd 100644 --- a/PuzzleGameProject/Assets/Scripts/Abilities/BlackDieAbility.cs +++ b/PuzzleGameProject/Assets/Scripts/Abilities/BlackDieAbility.cs @@ -12,7 +12,7 @@ namespace Abilities [SerializeField] private GameObject abilityUseOne; [SerializeField] private GameObject abilityUseTwo; [SerializeField] private GameObject abilityUseThree; - [SerializeField] private int _uses = 3; + private int _uses = 3; private GameObject[] _usesUsed; private bool _canClick; diff --git a/PuzzleGameProject/Assets/Scripts/Abilities/TorchAbility.cs b/PuzzleGameProject/Assets/Scripts/Abilities/TorchAbility.cs new file mode 100644 index 0000000..fcd1faf --- /dev/null +++ b/PuzzleGameProject/Assets/Scripts/Abilities/TorchAbility.cs @@ -0,0 +1,58 @@ +using System; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class TorchAbility : MonoBehaviour +{ + public static + event Action TorchAbilityUsed; + [SerializeField] private GameObject abilityUseOne; + [SerializeField] private GameObject abilityUseTwo; + + private int _uses = 2; + private GameObject[] _usesUsed; + private bool _canClick; + + private void OnEnable() + { + GameManager.StateChanged += HandleStateChanged; + } + + private void OnDisable() + { + GameManager.StateChanged -= HandleStateChanged; + } + + private void Start() + { + _usesUsed = new GameObject[_uses]; + abilityUseOne.GetComponent