diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 91a5af8..f34aca8 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -3433,11 +3433,11 @@ MonoBehaviour: - m_Target: {fileID: 197904229} m_TargetAssemblyTypeName: Akciok, Assembly-CSharp m_MethodName: Betarazas - m_Mode: 1 + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 2 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 diff --git a/Assets/Scripts/Akciok.cs b/Assets/Scripts/Akciok.cs index 42ae5c2..2deb1ff 100644 --- a/Assets/Scripts/Akciok.cs +++ b/Assets/Scripts/Akciok.cs @@ -10,24 +10,33 @@ public class Akciok : MonoBehaviour private int tolteny_index = 3; private int felhasznalt_tolteny = 0; public int betarazott_tolteny = 3; + private Akciopont ap; // private void Start() { + ap = FindObjectOfType(); + //kezdesnel karikazza be az elso harom adott toltenyt for (int i = 0; i < tolteny_index; i++) { toltenyek[i].text = "O"; } } - public void Betarazas() { - if (tolteny_index < 24) { + public void Betarazas(int betarazas) { + if (tolteny_index < 24 && ap.akciopont != 0) { + if(tolteny_index + betarazas > 23) { + tolteny_index = 23; + } else { + tolteny_index += betarazas; + } //felhasznalt toltenytol megy hogy az ott levo x-et ne irja felul - for (int i = felhasznalt_tolteny; i <= tolteny_index; i++) { + for (int i = felhasznalt_tolteny; i < tolteny_index; i++) { toltenyek[i].text = "O"; } - betarazott_tolteny++; - tolteny_index++; + betarazott_tolteny += betarazas; + //tolteny_index++; + ap.akciopont--; Debug.Log("Tolteny betarazva"); Debug.Log("Betarazott toltenyek szama: " + betarazott_tolteny); diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 7d2d6fb..be9e9e6 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 18086 + controlID: 2670 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 18087 + controlID: 2625 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 17923 + controlID: 2626 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -223,10 +223,10 @@ MonoBehaviour: m_SaveData: [] m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 10} + scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: a0c2ffff28fbffff5e6c0000926c00007a6e0000fa730000 + m_ExpandedIDs: 28fbffffc26e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -557,9 +557,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 5.460174, y: 1.2110815, z: -0.5397526} + m_Target: {x: -0.22078298, y: 0.3557275, z: -0.5135746} speed: 2 - m_Value: {x: 5.460174, y: 1.2110815, z: -0.5397526} + m_Value: {x: -0.22078298, y: 0.3557275, z: -0.5135746} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -610,9 +610,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 10.343856 + m_Target: 14.710003 speed: 2 - m_Value: 10.343856 + m_Value: 14.710003 m_Ortho: m_Target: 1 speed: 2 @@ -661,7 +661,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 18088 + controlID: 2589 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -742,9 +742,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 16760000 - m_LastClickedID: 30230 - m_ExpandedIDs: 00000000f4750000f6750000f8750000 + m_SelectedIDs: d2760000 + m_LastClickedID: 30418 + m_ExpandedIDs: 00000000c4760000c6760000c8760000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -772,7 +772,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f4750000f6750000f8750000 + m_ExpandedIDs: 00000000c4760000c6760000c8760000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -797,8 +797,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 6e6c0000 - m_LastClickedInstanceID: 27758 + m_SelectedInstanceIDs: f86b0000 + m_LastClickedInstanceID: 27640 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: @@ -901,8 +901,8 @@ MonoBehaviour: y: 0 width: 459 height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -942,7 +942,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 27758 + m_LastInspectedObjectInstanceID: 27640 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index d8398ec..ec36569 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Project + m_Title: Hierarchy m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 421} 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: 215 + controlID: 3084 --- !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: 245 + controlID: 3085 --- !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: 206 + controlID: 3086 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -247,7 +247,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 246 + controlID: 3251 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -449,9 +449,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f4750000 - m_LastClickedID: 0 - m_ExpandedIDs: ecddffff8edeffff26e0ffff86e5ffff2ae6ffffc2e7ffff36ecffffdaecffff48f0ffff28fbffff + m_SelectedIDs: f86b0000 + m_LastClickedID: 27640 + m_ExpandedIDs: 28fbffffc26e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -755,9 +755,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -6.146427, y: -0.20033516, z: -0.11077183} + m_Target: {x: -0.22078298, y: 0.3557275, z: -0.5135746} speed: 2 - m_Value: {x: -6.146427, y: -0.20033516, z: -0.11077183} + m_Value: {x: -0.22078298, y: 0.3557275, z: -0.5135746} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -808,9 +808,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 11.049766 + m_Target: 14.710003 speed: 2 - m_Value: 11.049766 + m_Value: 14.710003 m_Ortho: m_Target: 1 speed: 2 @@ -876,22 +876,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 55 m_LastFolders: - - Assets + - Assets/Scripts m_LastFoldersGridSize: 55 m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f4750000 - m_LastClickedID: 30196 - m_ExpandedIDs: 00000000f4750000fa83000076870000 + m_SelectedIDs: d2760000 + m_LastClickedID: 30418 + m_ExpandedIDs: 00000000c4760000c6760000c8760000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -919,7 +919,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f4750000 + m_ExpandedIDs: 00000000c4760000c6760000c8760000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: