From 126b6700ff8ea47ae24d65d48ab43320fe417d89 Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Tue, 29 Nov 2022 08:02:13 +0100 Subject: [PATCH] update --- Assets/Scripts/Akciok.cs | 14 ++- .../Layouts/CurrentMaximizeLayout.dwlt | 68 +++++++------- UserSettings/Layouts/default-2021.dwlt | 94 +++++++++---------- 3 files changed, 93 insertions(+), 83 deletions(-) diff --git a/Assets/Scripts/Akciok.cs b/Assets/Scripts/Akciok.cs index 1d10b0f..a8f686b 100644 --- a/Assets/Scripts/Akciok.cs +++ b/Assets/Scripts/Akciok.cs @@ -105,8 +105,18 @@ public class Akciok : MonoBehaviour nyomozasok[atirandoy, atirandox] = "nyomozott"; } + int counter = 0; + //egy sorral feljebb megy + for (int i = 0; i < nyomozasok.GetLength(0); i++) { + for (int j = 0; j < nyomozasok.GetLength(1); j++) { + if (nyomozasok[i, j].Equals("nyomozott")) { + nyomozas_x[counter].text = "X"; + counter++; + } + } + } - if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 1) { + /*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"; @@ -130,7 +140,7 @@ public class Akciok : MonoBehaviour nyomozas_x[10].text = "X"; } else if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 4) { nyomozas_x[11].text = "X"; - } + }*/ ap.akciopont--; diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 01fd81a..e48def7 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: 515 + controlID: 751 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,8 +45,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 319 - y: 19 + x: 318 + y: 73 width: 1107 height: 544 m_ViewDataDictionary: {fileID: 0} @@ -86,7 +86,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 516 + controlID: 752 --- !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: 444 + controlID: 753 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -226,7 +226,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 56f7ffff1cfbffffa4770000de780000167900002e79000050790000 + m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -269,8 +269,8 @@ MonoBehaviour: y: 0 width: 1109 height: 565 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} @@ -557,9 +557,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 537.12775, y: 224.99623, z: -0.40955842} + m_Target: {x: -6.1338487, y: -1.6809508, z: -0.17043884} speed: 2 - m_Value: {x: 537.12775, y: 224.99623, z: -0.40955842} + m_Value: {x: -6.1338487, y: -1.6809508, z: -0.17043884} 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: 255.19865 + m_Target: 15.1576 speed: 2 - m_Value: 255.19865 + m_Value: 15.1576 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: 517 + controlID: 717 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -672,7 +672,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AudioMixerWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -681,14 +681,14 @@ MonoBehaviour: y: 0 width: 752 height: 382 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 12} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 11} m_Panes: - {fileID: 11} - {fileID: 12} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -730,22 +730,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: 56770000 - m_LastClickedID: 30550 - m_ExpandedIDs: 0000000056770000587700005a770000767700007a770000 + m_SelectedIDs: 78770000 + m_LastClickedID: 30584 + m_ExpandedIDs: 00000000487700004a7700004c770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -773,7 +773,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000056770000587700005a770000 + m_ExpandedIDs: 00000000487700004a7700004c770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -798,10 +798,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: eae8ffff - m_LastClickedInstanceID: -5910 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c623000000000000 + m_SelectedInstanceIDs: 4a280000 + m_LastClickedInstanceID: 10314 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c62300000000000034ecffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -859,7 +859,7 @@ MonoBehaviour: m_SaveData: [] m_MixersTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 34ecffff + m_SelectedIDs: m_LastClickedID: -5068 m_ExpandedIDs: 12eb343c m_RenameOverlay: @@ -976,7 +976,7 @@ MonoBehaviour: oldMaxSizes: oldSplitSize: 0 m_HorizontalSplitter: - ID: 1253 + ID: 3048 splitterInitialOffset: 299 currentActiveSplitter: -1 realSizes: @@ -1119,8 +1119,8 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 31110 - m_LastVerticalScrollValue: 151 + m_LastInspectedObjectInstanceID: 10314 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index a465e40..52bb853 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 19 + controlID: 1139 --- !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: 110 + controlID: 1140 --- !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: 111 + controlID: 1141 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,10 +187,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 318 + width: 319 height: 565 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -206,23 +206,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 318 + x: 319 y: 0 - width: 1109 + width: 1108 height: 565 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 16} - {fileID: 14} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -247,7 +247,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 26 + controlID: 1099 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -265,7 +265,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 752 + width: 751 height: 382 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -290,9 +290,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 752 + x: 751 y: 0 - width: 675 + width: 676 height: 382 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} @@ -320,8 +320,8 @@ MonoBehaviour: y: 0 width: 493 height: 947 - 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: 20} m_Panes: - {fileID: 20} @@ -347,9 +347,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 318 + x: 319 y: 73 - width: 1107 + width: 1106 height: 544 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -361,11 +361,11 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1107, y: 523} + m_TargetSize: {x: 1106, y: 523} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 + m_EnterPlayModeBehavior: 1 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 @@ -376,8 +376,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -553.5 - m_HBaseRangeMax: 553.5 + m_HBaseRangeMin: -553 + m_HBaseRangeMax: 553 m_VBaseRangeMin: -261.5 m_VBaseRangeMax: 261.5 m_HAllowExceedBaseRangeMin: 1 @@ -388,7 +388,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -397,23 +397,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1107 + width: 1106 height: 523 m_Scale: {x: 1, y: 1} - m_Translation: {x: 553.5, y: 261.5} + m_Translation: {x: 553, y: 261.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -553.5 + x: -553 y: -261.5 - width: 1107 + width: 1106 height: 523 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1107, y: 544} + m_LastWindowPixelSize: {x: 1106, y: 544} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -441,7 +441,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 317 + width: 318 height: 544 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -756,9 +756,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -10.188012, y: -4.2742414, z: -0.089166746} + m_Target: {x: -6.1338487, y: -1.6809508, z: -0.17043884} speed: 2 - m_Value: {x: -10.188012, y: -4.2742414, z: -0.089166746} + m_Value: {x: -6.1338487, y: -1.6809508, z: -0.17043884} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -809,9 +809,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 6.876118 + m_Target: 15.1576 speed: 2 - m_Value: 6.876118 + m_Value: 15.1576 m_Ortho: m_Target: 1 speed: 2 @@ -858,7 +858,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 638 - width: 751 + width: 750 height: 361 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -877,22 +877,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: 46770000 - m_LastClickedID: 30534 - m_ExpandedIDs: 0000000046770000487700004a770000 + m_SelectedIDs: 78770000 + m_LastClickedID: 30584 + m_ExpandedIDs: 00000000487700004a7700004c770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -920,7 +920,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000046770000487700004a770000 + m_ExpandedIDs: 00000000487700004a7700004c770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -947,7 +947,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c62300000000000034ecffff m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1172,9 +1172,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 752 + x: 751 y: 638 - width: 673 + width: 674 height: 361 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: