diff --git a/PuzzleGameProject/Assets/Scenes/Templates/NewDungeon.unity b/PuzzleGameProject/Assets/Scenes/Templates/NewDungeon.unity index e95019e..a2e8bab 100644 --- a/PuzzleGameProject/Assets/Scenes/Templates/NewDungeon.unity +++ b/PuzzleGameProject/Assets/Scenes/Templates/NewDungeon.unity @@ -215,142 +215,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 04241db9fdb62a147acac6895a47db06, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &60872503 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 60872504} - - component: {fileID: 60872506} - - component: {fileID: 60872505} - m_Layer: 5 - m_Name: Diamonds - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &60872504 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 60872503} - 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: 1353551474} - 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: 160.8, y: -237} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &60872505 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 60872503} - 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: New 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: 4294835968 - m_fontColor: {r: 0, g: 1, b: 0.99077415, 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: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 4 - 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 &60872506 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 60872503} - m_CullTransparentMesh: 1 --- !u!1 &323570087 GameObject: m_ObjectHideFlags: 0 @@ -380,7 +244,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a277ce4246f154447a52f88a6c9937e0, type: 3} m_Name: m_EditorClassIdentifier: - canvas: {fileID: 1353551473} + canvas: {fileID: 0} hudController: {fileID: 337186334} chestPopUpControllerGO: {fileID: 1772543306} chestPopUpController: {fileID: 1772543309} @@ -391,6 +255,7 @@ MonoBehaviour: blackDieAbility: {fileID: 37414492} chestRewardSelection: {fileID: 1772543310} torchAbility: {fileID: 1015377333} + player: {fileID: 386902759} --- !u!4 &323570089 Transform: m_ObjectHideFlags: 0 @@ -678,8 +543,6 @@ MonoBehaviour: m_EditorClassIdentifier: maxHealth: 20 diamonds: 0 - healthGO: {fileID: 1728296560} - diamondsGO: {fileID: 60872503} rooms: {fileID: 0} --- !u!114 &386902760 MonoBehaviour: @@ -2106,110 +1969,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3} m_PrefabInstance: {fileID: 1333995205} m_PrefabAsset: {fileID: 0} ---- !u!1 &1353551473 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1353551474} - - component: {fileID: 1353551477} - - component: {fileID: 1353551476} - - component: {fileID: 1353551475} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1353551474 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1353551473} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 60872504} - - {fileID: 1728296563} - - {fileID: 1804910034} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!114 &1353551475 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1353551473} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1353551476 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1353551473} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1353551477 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1353551473} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!1 &1417835870 GameObject: m_ObjectHideFlags: 0 @@ -2361,142 +2120,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3} m_PrefabInstance: {fileID: 1577335134} m_PrefabAsset: {fileID: 0} ---- !u!1 &1728296560 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1728296563} - - component: {fileID: 1728296562} - - component: {fileID: 1728296561} - m_Layer: 5 - m_Name: Health - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1728296561 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1728296560} - 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: New 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: 4278255434 - m_fontColor: {r: 0.29063714, g: 1, 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: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 4 - 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 &1728296562 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1728296560} - m_CullTransparentMesh: 1 ---- !u!224 &1728296563 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1728296560} - 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: 1353551474} - 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: 222, y: 230} - m_SizeDelta: {x: 150.14, y: 50} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1772543306 GameObject: m_ObjectHideFlags: 0 @@ -2677,112 +2300,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3} m_PrefabInstance: {fileID: 1775902214} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1804910033 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1353551474} - m_Modifications: - - target: {fileID: 6007503688929917977, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_Name - value: ChestPopUp - objectReference: {fileID: 0} - - target: {fileID: 6007503688929917977, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_SizeDelta.x - value: 293.24768 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_SizeDelta.y - value: 164.10168 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2d3967bed0790c44c88fabab60350749, type: 3} ---- !u!224 &1804910034 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7983622854988183681, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - m_PrefabInstance: {fileID: 1804910033} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1948928674 PrefabInstance: m_ObjectHideFlags: 0 @@ -3333,7 +2850,6 @@ SceneRoots: - {fileID: 323570089} - {fileID: 386902761} - {fileID: 896056464} - - {fileID: 1353551474} - {fileID: 1417835872} - {fileID: 337186333} - {fileID: 1772543308} diff --git a/PuzzleGameProject/Assets/Scenes/Templates/NewDungeonTemplate.scenetemplate b/PuzzleGameProject/Assets/Scenes/Templates/NewDungeonTemplate.scenetemplate index 2babcb8..0203a64 100644 --- a/PuzzleGameProject/Assets/Scenes/Templates/NewDungeonTemplate.scenetemplate +++ b/PuzzleGameProject/Assets/Scenes/Templates/NewDungeonTemplate.scenetemplate @@ -22,6 +22,8 @@ MonoBehaviour: instantiationMode: 1 - dependency: {fileID: -4733365628477956816, guid: 99ca6393897edf24799dbcc0df57e904, type: 3} instantiationMode: 1 + - dependency: {fileID: 2800000, guid: 12c75eb8a2e326b4e9c47b9f7cb06a2c, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 3028dc075ba8c584d9bc7d1e0255e038, type: 3} instantiationMode: 1 - dependency: {fileID: 7433441132597879392, guid: 6b393637cabb3ce42bcdb2396af15f70, type: 3} @@ -38,8 +40,8 @@ MonoBehaviour: instantiationMode: 1 - dependency: {fileID: 2800000, guid: b9a93e3830914ec4bb885cca1ec68d3f, type: 3} instantiationMode: 0 - - dependency: {fileID: 6007503688929917977, guid: 2d3967bed0790c44c88fabab60350749, type: 3} - instantiationMode: 1 + - dependency: {fileID: 2800000, guid: 251a73d312e38e24d970c06b9ea50c5f, type: 3} + instantiationMode: 0 - dependency: {fileID: 7874367151511621086, guid: de405f9dca058480ab9e8433965408b2, type: 3} instantiationMode: 1 - dependency: {fileID: 2800000, guid: ca55846e26dc89e45b6e0afa16f84977, type: 3} @@ -58,6 +60,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: a3052a5a54720ef4d98f96950d425fe8, type: 3} instantiationMode: 0 + - dependency: {fileID: 7433441132597879392, guid: be54492010453064cb419a92c1c53a8d, type: 3} + instantiationMode: 1 - dependency: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} instantiationMode: 1 - dependency: {fileID: 9197481963319205126, guid: 17df250617a702f4e897f28d1f9182df, type: 3} diff --git a/PuzzleGameProject/Assets/Scripts/Player.cs b/PuzzleGameProject/Assets/Scripts/Player.cs index df00b89..c043e46 100644 --- a/PuzzleGameProject/Assets/Scripts/Player.cs +++ b/PuzzleGameProject/Assets/Scripts/Player.cs @@ -5,10 +5,11 @@ using UnityEngine.Serialization; public class Player : MonoBehaviour { + public event Action DiamondCountUpdated; + public event Action HealthUpdated; + [SerializeField] private int maxHealth; [SerializeField] private int diamonds; - [FormerlySerializedAs("healthGameObject")] [SerializeField] private GameObject healthGO; - [FormerlySerializedAs("DiamondsGO")] [SerializeField] private GameObject diamondsGO; [SerializeField] private GameObject rooms; private int _healthIndex = 0; private readonly int[] _healthBar = {0, 0, -1, -2, -4, -6, -9, -12, -16, -20}; @@ -56,8 +57,8 @@ public class Player : MonoBehaviour private void UpdateGUI() { - healthGO.GetComponent().text = _healthBar[_healthIndex].ToString(); - diamondsGO.GetComponent().text = diamonds.ToString(); + DiamondCountUpdated?.Invoke(diamonds); + HealthUpdated?.Invoke(_healthIndex); } private void HandleDiamondAndLifeAbilitySelected() diff --git a/PuzzleGameProject/Assets/Scripts/UI/InGameHUDController.cs b/PuzzleGameProject/Assets/Scripts/UI/InGameHUDController.cs index d786f7b..bc36965 100644 --- a/PuzzleGameProject/Assets/Scripts/UI/InGameHUDController.cs +++ b/PuzzleGameProject/Assets/Scripts/UI/InGameHUDController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.UIElements; @@ -46,6 +47,10 @@ namespace UI private List _armorUses = new List(); private int _armorUsesUsed = 0; + + private List _healthAreas; + + private Label diamondCount; public void OnEnable() @@ -58,7 +63,10 @@ namespace UI GroupBox startingBlackDieGroupBox = root.Q("StartingBlackDieUses"); startingBlackDieGroupBox.AddManipulator(new Clickable(evt => HandleStartingBlackDieAbilityClicked())); GroupBox diceGroupBox = root.Q("Dice"); - + VisualElement healthArea = root.Q("HealthArea"); + _healthAreas = healthArea.Children().ToList(); + diamondCount = root.Q