diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index a9b6dff..959af84 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -3498,6 +3498,10 @@ MonoBehaviour: - {fileID: 970497337} - {fileID: 1363492852} - {fileID: 28410456} + nyomozas_oszlop: + - {fileID: 1538197611} + - {fileID: 995673070} + - {fileID: 720345110} elso_sor_text: {fileID: 1038029797} masodik_sor: - {fileID: 538133533} diff --git a/Assets/Scripts/Akciok.cs b/Assets/Scripts/Akciok.cs index 457597c..be048b7 100644 --- a/Assets/Scripts/Akciok.cs +++ b/Assets/Scripts/Akciok.cs @@ -17,6 +17,7 @@ public class Akciok : MonoBehaviour //Nyomozashoz private movement movement; public TMP_Text[] nyomozas_x; + public TMP_Text[] nyomozas_oszlop; private string[,] nyomozasok = { {"ures", "ures", "ures", "" }, @@ -119,34 +120,10 @@ public class Akciok : MonoBehaviour } } - /*if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 1) { - nyomozas_x[0].text = "X"; - } else if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 2) { - nyomozas_x[1].text = "X"; - } else if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 3) { - nyomozas_x[2].text = "X"; - } else if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 4) { - nyomozas_x[3].text = "X"; - } else if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 1) { - nyomozas_x[4].text = "X"; - } else if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 2) { - nyomozas_x[5].text = "X"; - } else if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 3) { - nyomozas_x[6].text = "X"; - } else if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 4) { - nyomozas_x[7].text = "X"; - } else if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 1) { - nyomozas_x[8].text = "X"; - } else if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 2) { - nyomozas_x[9].text = "X"; - } else if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 3) { - nyomozas_x[10].text = "X"; - } else if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 4) { - nyomozas_x[11].text = "X"; - }*/ - ap.akciopont--; + NyomozasOszlopCheck(); + for (int i = 0; i < nyomozasok.GetLength(0); i++) { string sor = ""; for (int j = 0; j < nyomozasok.GetLength(1); j++) { @@ -156,6 +133,26 @@ public class Akciok : MonoBehaviour } } + private void NyomozasOszlopCheck() { + int oszlop = movement.jelenlegi_x; + int nyomozas_counter = 0; + + for (int i = 0; i < 4; i++) { + if (nyomozasok[i, oszlop].Equals("nyomozott")) { + nyomozas_counter++; + Debug.Log(nyomozasok[i, oszlop]); + } + } + + Debug.Log("nyomozas counter: " + nyomozas_counter); + + if(nyomozas_counter == 4) { + ap.akciopont += 2; + Debug.Log("Ap novelve"); + nyomozas_oszlop[oszlop].text = "X"; + } + } + public void Hack() { int count = 0; diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 52bb853..ed23ef7 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -16,12 +16,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 43 - width: 1920 - height: 997 + width: 1366 + height: 685 m_ShowMode: 4 m_Title: Hierarchy m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 300} + m_MinSize: {x: 875, y: 421} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 1366 + height: 685 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1366 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 665 + width: 1366 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -109,17 +109,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 6} - - {fileID: 13} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 947 + width: 1366 + height: 635 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 1139 + controlID: 599 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1427 - height: 947 + width: 1048 + height: 635 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 1140 + controlID: 600 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1427 - height: 565 + width: 1048 + height: 422 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 1141 + controlID: 601 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,13 +187,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 319 - height: 565 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + width: 234 + height: 422 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 15} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -206,49 +206,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 319 + x: 234 y: 0 - width: 1108 - height: 565 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 814 + height: 422 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} m_Panes: - - {fileID: 16} - {fileID: 14} - m_Selected: 1 - m_LastSelected: 0 ---- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 11} - {fileID: 12} - m_Position: - serializedVersion: 2 - x: 0 - y: 565 - width: 1427 - height: 382 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 1099 ---- !u!114 &11 + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -258,50 +233,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 751 - height: 382 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 17} - - {fileID: 18} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 751 - y: 0 - width: 676 - height: 382 + x: 0 + y: 422 + width: 1048 + height: 213 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 19} - m_Selected: 0 + - {fileID: 15} + - {fileID: 16} + - {fileID: 17} + m_Selected: 2 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -316,18 +266,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1427 + x: 1048 y: 0 - width: 493 - height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 20} + width: 318 + height: 635 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 20} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -347,10 +297,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 319 + x: 234 y: 73 - width: 1106 - height: 544 + width: 812 + height: 289 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -361,11 +311,11 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1106, y: 523} + m_TargetSize: {x: 812, y: 268} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 1 + m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 @@ -376,10 +326,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -553 - m_HBaseRangeMax: 553 - m_VBaseRangeMin: -261.5 - m_VBaseRangeMax: 261.5 + m_HBaseRangeMin: -406 + m_HBaseRangeMax: 406 + m_VBaseRangeMin: -134 + m_VBaseRangeMax: 134 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -388,7 +338,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -397,29 +347,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1106 - height: 523 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 553, y: 261.5} + width: 812 + height: 268 + m_Scale: {x: 1.1592739, y: 1.159274} + m_Translation: {x: 448.68536, y: 129.369} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -553 - y: -261.5 - width: 1106 - height: 523 + x: -387.04 + y: -111.59485 + width: 700.4385 + height: 231.17917 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1106, y: 544} + m_LastWindowPixelSize: {x: 812, y: 289} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &15 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -441,8 +391,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 318 - height: 544 + width: 233 + height: 401 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -452,7 +402,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 28fbffff + m_ExpandedIDs: 20fbffffcc6c0000e26d0000826f00000a730000a273000000740000fa740000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -476,7 +426,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &16 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -496,10 +446,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 318 + x: 234 y: 73 - width: 1107 - height: 544 + width: 812 + height: 401 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -756,9 +706,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -6.1338487, y: -1.6809508, z: -0.17043884} + m_Target: {x: -5.1782165, y: -1.0652641, z: 0.09179648} speed: 2 - m_Value: {x: -6.1338487, y: -1.6809508, z: -0.17043884} + m_Value: {x: -5.1782165, y: -1.0652641, z: 0.09179648} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -809,9 +759,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 15.1576 + m_Target: 10.474212 speed: 2 - m_Value: 15.1576 + m_Value: 10.474212 m_Ortho: m_Target: 1 speed: 2 @@ -836,7 +786,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &17 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -857,9 +807,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 638 - width: 750 - height: 361 + y: 398 + width: 1007 + height: 235 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -885,14 +835,14 @@ MonoBehaviour: m_LastFolders: - Assets/Scripts m_LastFoldersGridSize: 55 - m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource + m_LastProjectPath: C:\dev\find the source m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 78770000 - m_LastClickedID: 30584 - m_ExpandedIDs: 00000000487700004a7700004c770000 + m_SelectedIDs: 72770000 + m_LastClickedID: 30578 + m_ExpandedIDs: 000000004e77000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -908,7 +858,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 10} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -920,7 +870,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000487700004a7700004c770000 + m_ExpandedIDs: 000000004e77000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -945,8 +895,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 4c280000 + m_LastClickedInstanceID: 10316 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c62300000000000034ecffff m_RenameOverlay: @@ -964,7 +914,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -976,7 +926,7 @@ MonoBehaviour: m_GridSize: 55 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 164 ---- !u!114 &18 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1024,7 +974,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 10} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1152,7 +1102,7 @@ MonoBehaviour: m_ShowReferencedBuses: 1 m_ShowBusConnections: 0 m_ShowBusConnectionsOfSelection: 0 ---- !u!114 &19 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1172,15 +1122,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 751 - y: 638 - width: 674 - height: 361 + x: 0 + y: 495 + width: 1047 + height: 192 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &20 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1200,10 +1150,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1427 + x: 1048 y: 73 - width: 492 - height: 926 + width: 317 + height: 614 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default