diff --git a/.gitignore b/.gitignore index 8af868e..393ca9a 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ sysinfo.txt # Crashlytics generated file crashlytics-build.properties +UserSettings/Layouts/default-2021.dwlt diff --git a/Assets/Scenes/JatekosNyert.unity b/Assets/Scenes/JatekosNyert.unity index fc70ce3..522e5c2 100644 --- a/Assets/Scenes/JatekosNyert.unity +++ b/Assets/Scenes/JatekosNyert.unity @@ -389,6 +389,144 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b9102add15fe89844a6f103c51332836, type: 3} m_Name: m_EditorClassIdentifier: + MainMenuObj: {fileID: 0} + OptionsMenu: {fileID: 0} + VideoButton: {fileID: 0} +--- !u!1 &1041644987 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1041644988} + - component: {fileID: 1041644990} + - component: {fileID: 1041644989} + m_Layer: 5 + m_Name: pont_text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1041644988 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041644987} + 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: 1934114490} + m_RootOrder: 2 + 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: 25.02, y: -145.89} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1041644989 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041644987} + 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: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1041644990 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041644987} + m_CullTransparentMesh: 1 --- !u!1 &1127070444 GameObject: m_ObjectHideFlags: 0 @@ -685,6 +823,7 @@ RectTransform: m_Children: - {fileID: 1956911019} - {fileID: 1127070445} + - {fileID: 1041644988} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/vegpontozas.cs b/Assets/Scripts/vegpontozas.cs index 5da1ef4..93c2ee1 100644 --- a/Assets/Scripts/vegpontozas.cs +++ b/Assets/Scripts/vegpontozas.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using UnityEngine; +using TMPro; public class vegpontozas : MonoBehaviour @@ -11,7 +12,9 @@ public class vegpontozas : MonoBehaviour private Targyak targyak; private Akciok akciok; private Elet elet; - public bool foundsource; + + + public GameObject szoveg; int osszpont = 0; int tolteny; @@ -27,7 +30,6 @@ public class vegpontozas : MonoBehaviour targyak = FindObjectOfType(); akciok = FindObjectOfType(); elet = FindObjectOfType(); - foundsource = false; } public int OsszpontSzamalas() @@ -39,6 +41,7 @@ public class vegpontozas : MonoBehaviour fejlesztespont = FejlesztesPont.fejlesztes_szamlalo; osszpont = (energiapont * 2) + (megmaradtelet * 2) + (fejlesztespont / 3) + (tolteny / 2) + megszerzetttargyak; + textMesh.text = "Összesen ennyi pontot szereztél:" + osszpont; return osszpont; } } diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 473dd80..360083d 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1470 height: 811 m_ShowMode: 4 - m_Title: Game + m_Title: Hierarchy m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 371} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 3945 + controlID: 61 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 3950 + controlID: 62 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 3986 + controlID: 63 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -189,8 +189,8 @@ MonoBehaviour: y: 0 width: 278 height: 451 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -233,7 +233,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -242,14 +242,14 @@ MonoBehaviour: y: 451 width: 1122.5 height: 310 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - {fileID: 16} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -269,8 +269,8 @@ MonoBehaviour: y: 0 width: 347.5 height: 761 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -399,9 +399,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 2afbfffff66b00002e6d000060760000a2760000fe770000 + m_SelectedIDs: 5cd90000 + m_LastClickedID: 55644 + m_ExpandedIDs: c6d0ffffced1ffff2afbfffffcd70000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -839,8 +839,8 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 247a0000 - m_LastClickedID: 31268 + m_SelectedIDs: 1c7a0000 + m_LastClickedID: 31260 m_ExpandedIDs: 00000000027a000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000027a000000ca9a3bffffff7f + m_ExpandedIDs: 00000000027a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -894,8 +894,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 96300000 - m_LastClickedInstanceID: 12438 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: