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