diff --git a/Assets/Scripts/Energia.cs b/Assets/Scripts/Energia.cs index 93a8159..d767db7 100644 --- a/Assets/Scripts/Energia.cs +++ b/Assets/Scripts/Energia.cs @@ -13,7 +13,11 @@ public class Energia : MonoBehaviour public void setEnegiasavIndex(int ertek) { energiasav_index = ertek; } public void csokkenEnergia(int number) { - if (granatAktivalva) return; //targy cucc aktivalva egesz korbe nem csokken az energia + if (granatAktivalva) { + granatAktivalva = false; + return; //targy cucc aktivalva egesz korbe nem csokken az energia + } + if (energiasav_index > 30) return; for (int i = 0; i < number; i++) { diff --git a/Assets/Scripts/movement.cs b/Assets/Scripts/movement.cs index 3bccc99..8c16eb0 100644 --- a/Assets/Scripts/movement.cs +++ b/Assets/Scripts/movement.cs @@ -641,7 +641,7 @@ public class movement : MonoBehaviour { for (int y = 0; y < h; y++) { if (helyek[y, x].Equals("oneone")) { Debug.Log("Player clicked on the collider: " + oneone_Collider.gameObject.name); - tavolsag = math.abs(((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y)); + tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); if (eromulepes1.activeSelf == true & eromulepes2.activeSelf == true) { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); } else { @@ -675,7 +675,7 @@ public class movement : MonoBehaviour { for (int y = 0; y < h; y++) { if (helyek[y, x].Equals("twoone")) { Debug.Log("Player clicked on the collider: " + twoone_Collider.gameObject.name); - tavolsag = math.abs(((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y)); + tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); if (feketepiaclepes1.activeSelf == true & feketepiaclepes2.activeSelf == true) { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); } else { @@ -718,7 +718,7 @@ public class movement : MonoBehaviour { for (int y = 0; y < h; y++) { if (helyek[y, x].Equals("threeone")) { Debug.Log("Player clicked on the collider: " + threeone_Collider.gameObject.name); - tavolsag = math.abs(((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y)); + tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); if (metrolepes1.activeSelf == true & metrolepes2.activeSelf == true) { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); } else { @@ -756,7 +756,7 @@ public class movement : MonoBehaviour { for (int y = 0; y < h; y++) { if (helyek[y, x].Equals("onetwo")) { Debug.Log("Player clicked on the collider: " + onetwo_Collider.gameObject.name); - tavolsag = math.abs(((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y)); + tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); if (szervereklepes1.activeSelf == true & szervereklepes2.activeSelf == true) { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); @@ -799,7 +799,7 @@ public class movement : MonoBehaviour { for (int y = 0; y < h; y++) { if (helyek[y, x].Equals("twotwo")) { Debug.Log("Player clicked on the collider: " + twotwo_Collider.gameObject.name); - tavolsag = math.abs(((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y)); + tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); if (kingcasinolepes1.activeSelf == true & kingcasinolepes2.activeSelf == true) { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); @@ -839,7 +839,7 @@ public class movement : MonoBehaviour { for (int y = 0; y < h; y++) { if (helyek[y, x].Equals("threetwo")) { Debug.Log("Player clicked on the collider: " + threetwo_Collider.gameObject.name); - tavolsag = math.abs(((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y)); + tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); if (feltoltolepes1.activeSelf == true & feltoltolepes2.activeSelf == true) { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); @@ -883,7 +883,7 @@ public class movement : MonoBehaviour { for (int y = 0; y < h; y++) { if (helyek[y, x].Equals("onethree")) { Debug.Log("Player clicked on the collider: " + onethree_Collider.gameObject.name); - tavolsag = math.abs(((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y)); + tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); if (kutatolaborlepes1.activeSelf == true & kutatolaborlepes2.activeSelf == true) { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); @@ -923,7 +923,7 @@ public class movement : MonoBehaviour { for (int y = 0; y < h; y++) { if (helyek[y, x].Equals("twothree")) { Debug.Log("Player clicked on the collider: " + twothree_Collider.gameObject.name); - tavolsag = math.abs(((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y)); + tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); if (kriptoklublepes1.activeSelf == true & kriptoklublepes2.activeSelf == true) { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); @@ -968,7 +968,7 @@ public class movement : MonoBehaviour { for (int y = 0; y < h; y++) { if (helyek[x, y].Equals("threethree")) { Debug.Log("Player clicked on the collider: " + threethree_Collider.gameObject.name); - tavolsag = math.abs(((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y)); + tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); if (cyberplazalepes1.activeSelf == true & cyberplazalepes2.activeSelf == true) { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); @@ -1008,7 +1008,7 @@ public class movement : MonoBehaviour { for (int y = 0; y < h; y++) { if (helyek[y, x].Equals("onefour")) { Debug.Log("Player clicked on the collider: " + onefour_Collider.gameObject.name); - tavolsag = math.abs(((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y)); + tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); if (hadiuzemlepes1.activeSelf == true & hadiuzemlepes2.activeSelf == true) { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); @@ -1048,7 +1048,7 @@ public class movement : MonoBehaviour { for (int y = 0; y < h; y++) { if (helyek[y, x].Equals("twofour")) { Debug.Log("Player clicked on the collider: " + twofour_Collider.gameObject.name); - tavolsag = math.abs(((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y)); + tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); if (konyvtarlepes1.activeSelf == true & konyvtarlepes2.activeSelf == true) { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); @@ -1088,7 +1088,7 @@ public class movement : MonoBehaviour { for (int y = 0; y < h; y++) { if (helyek[y, x].Equals("threefour")) { Debug.Log("Player clicked on the collider: " + threefour_Collider.gameObject.name); - tavolsag = math.abs(((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y)); + tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); if (korhazlepes1.activeSelf == true & korhazlepes2.activeSelf == true) { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 179d3a9..28ef0d8 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: 474 + controlID: 374 --- !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: 475 + controlID: 375 --- !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: 453 + controlID: 376 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -226,7 +226,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 14fbffff + m_ExpandedIDs: 20fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -647,7 +647,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: @@ -656,15 +656,15 @@ MonoBehaviour: y: 574 width: 1348 height: 373 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 12} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} - {fileID: 11} - {fileID: 12} - m_Selected: 2 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 2 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -706,22 +706,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 71 m_LastFolders: - - Assets + - Assets/Scripts m_LastFoldersGridSize: 71 m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 5e770000 - m_LastClickedID: 30558 - m_ExpandedIDs: 000000005e7700006077000062770000 + m_SelectedIDs: 84770000 + m_LastClickedID: 30596 + m_ExpandedIDs: 000000005c7700005e77000060770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -749,7 +749,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005e7700006077000062770000 + m_ExpandedIDs: 000000005c7700005e77000060770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,8 +1028,8 @@ MonoBehaviour: y: 0 width: 572 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: 14} m_Panes: - {fileID: 14}